diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.ALL.nuspec b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.ALL.nuspec index a736378a78..bb78e49a05 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.ALL.nuspec +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.ALL.nuspec @@ -5,7 +5,7 @@ Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.All - 1.2.1 + 1.2.2 The ADLS adapter implementation for the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.csproj b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.csproj index e5ff82cfc3..5f0fc70aa6 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.csproj +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45;net462 - 1.2.1 + 1.2.2 The ADLS adapter implementation for the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.nuspec b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.nuspec index f0696e9088..abb26de22f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.nuspec +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.nuspec @@ -5,7 +5,7 @@ Microsoft.CommonDataModel.ObjectModel.Adapter.Adls - 1.2.1 + 1.2.2 The ADLS adapter implementation for the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ManifestDefinitionTests.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ManifestDefinitionTests.cs new file mode 100644 index 0000000000..5b4b761cf8 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ManifestDefinitionTests.cs @@ -0,0 +1,43 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +namespace Microsoft.CommonDataModel.ObjectModel.Tests.Cdm +{ + using Microsoft.CommonDataModel.ObjectModel.Cdm; + using Microsoft.VisualStudio.TestTools.UnitTesting; + + [TestClass] + public class ManifestDefinitionTests + { + /// + /// Tests if the copy function creates copies of the sub objects + /// + [TestMethod] + public void TestManifestCopy() + { + var corpus = new CdmCorpusDefinition(); + var manifest = new CdmManifestDefinition(corpus.Ctx, "name"); + + var entityName = "entity"; + var subManifestName = "subManifest"; + var relationshipName = "relName"; + var traitName = "traitName"; + + var entityDec = manifest.Entities.Add(entityName); + var subManifest = manifest.SubManifests.Add(subManifestName); + var relationship = manifest.Relationships.Add(relationshipName); + var trait = manifest.ExhibitsTraits.Add(traitName); + + var copy = manifest.Copy() as CdmManifestDefinition; + copy.Entities[0].EntityName = "newEntity"; + copy.SubManifests[0].ManifestName = "newSubManifest"; + copy.Relationships[0].Name = "newRelName"; + copy.ExhibitsTraits[0].NamedReference = "newTraitName"; + + Assert.AreEqual(entityName, entityDec.EntityName); + Assert.AreEqual(subManifestName, subManifest.ManifestName); + Assert.AreEqual(relationshipName, relationship.Name); + Assert.AreEqual(traitName, trait.NamedReference); + } + } +} diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Projection/AttributeContextUtil.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Projection/AttributeContextUtil.cs index 5d2be999e4..6aabce2bb7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Projection/AttributeContextUtil.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Projection/AttributeContextUtil.cs @@ -154,11 +154,10 @@ private void GetArgumentValues(CdmArgumentDefinition args) /// /// A function to validate if the attribute context tree & traits generated for a resolved entity is the same as the expected and saved attribute context tree & traits for a test case /// - /// /// /// /// - public static async Task ValidateAttributeContext(CdmCorpusDefinition corpus, string expectedOutputPath, string entityName, CdmEntityDefinition resolvedEntity) + public static async Task ValidateAttributeContext(string expectedOutputPath, string entityName, CdmEntityDefinition resolvedEntity, bool updateExpectedOutput = false) { if (resolvedEntity.AttributeContext != null) { @@ -174,6 +173,12 @@ public static async Task ValidateAttributeContext(CdmCorpusDefinition corpus, st // Expected string expectedStringFilePath = Path.GetFullPath(Path.Combine(expectedOutputPath, $"AttrCtx_{entityName}.txt")); + + if (updateExpectedOutput) + { + File.WriteAllText(expectedStringFilePath, File.ReadAllText(actualStringFilePath)); + } + string expectedText = File.ReadAllText(expectedStringFilePath); // Test if Actual is Equal to Expected diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Relationship/CalculateRelationshipTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Relationship/CalculateRelationshipTest.cs index 9e615d65df..d4935b80a5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Relationship/CalculateRelationshipTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Relationship/CalculateRelationshipTest.cs @@ -137,7 +137,7 @@ public async Task TestCompositeKeyNonPolymorphicRelationship() /// /// /// - private async Task TestRun(string testName, string entityName, bool isEntitySet) + private async Task TestRun(string testName, string entityName, bool isEntitySet, bool updateExpectedOutput = false) { CdmCorpusDefinition corpus = TestHelper.GetLocalCorpus(testsSubpath, testName); string inputFolder = TestHelper.GetInputFolderPath(testsSubpath, testName); @@ -155,7 +155,7 @@ private async Task TestRun(string testName, string entityName, bool isEntitySet) CdmEntityDefinition resolvedEntity = await ProjectionTestUtils.GetResolvedEntity(corpus, entity, new List { "referenceOnly" }); AssertEntityShapeInResolvedEntity(resolvedEntity, isEntitySet); - await AttributeContextUtil.ValidateAttributeContext(corpus, expectedOutputFolder, entityName, resolvedEntity); + await AttributeContextUtil.ValidateAttributeContext(expectedOutputFolder, entityName, resolvedEntity, updateExpectedOutput); await corpus.CalculateEntityGraphAsync(manifest); await manifest.PopulateManifestRelationshipsAsync(); diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTests.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTests.cs index 7fa5f23107..8cb61acd99 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTests.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTests.cs @@ -8,6 +8,7 @@ namespace Microsoft.CommonDataModel.ObjectModel.Tests.Cdm using System.Threading.Tasks; using Microsoft.CommonDataModel.ObjectModel.Cdm; using Microsoft.CommonDataModel.ObjectModel.Storage; + using Microsoft.CommonDataModel.ObjectModel.Tests.Cdm.Projection; using Microsoft.CommonDataModel.ObjectModel.Tests.Cdm.Resolution; using Microsoft.CommonDataModel.ObjectModel.Utilities; using Microsoft.CommonDataModel.Tools.Processor; @@ -285,5 +286,20 @@ public async Task TestSettingTraitsForResolutionGuidanceAttributes() Assert.IsNotNull(resolvedEntity.Attributes[0].AppliedTraits.Item("is.linkedEntity.identifier")); } + + /// + /// Test that traits(including the ones inside of dataTypeRefence and PurposeReference) are applied to an entity attribute and type attribute. + /// + /// + [TestMethod] + public async Task TestAppliedTraitsInAttributes() + { + CdmCorpusDefinition corpus = TestHelper.GetLocalCorpus(testsSubpath, "TestAppliedTraitsInAttributes"); + string expectedOutputFolder = TestHelper.GetExpectedOutputFolderPath(testsSubpath, "TestAppliedTraitsInAttributes"); + CdmEntityDefinition entity = await corpus.FetchObjectAsync("local:/Sales.cdm.json/Sales"); + CdmEntityDefinition resolvedEntity = await ProjectionTestUtils.GetResolvedEntity(corpus, entity, new List { "referenceOnly" }); + + await AttributeContextUtil.ValidateAttributeContext(expectedOutputFolder, "Sales", resolvedEntity); + } } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTraitGroupTests.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTraitGroupTests.cs index 847db7332b..330e01a798 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTraitGroupTests.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/Resolution/EntityResolutionTraitGroupTests.cs @@ -41,9 +41,12 @@ public async Task TestTraitsFromTraitGroup() CdmCorpusDefinition cdmCorpus = TestHelper.GetLocalCorpus(testsSubpath, "TestResolvedTraitGroup"); cdmCorpus.SetEventCallback(new EventCallback { Invoke = (CdmStatusLevel statusLevel, string message) => - { - Assert.Fail($"Received {statusLevel} message: {message}"); - } + { + if (!message.Contains("Resolution guidance is being deprecated in favor of Projections.")) + { + Assert.Fail($"Received {statusLevel} message: {message}"); + } + } }, CdmStatusLevel.Warning); var ent = await cdmCorpus.FetchObjectAsync("local:/E2EResolution/Contact.cdm.json/Contact"); diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/CommonTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/CommonTest.cs index 5c27e37168..ebc1ba976a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/CommonTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/CommonTest.cs @@ -57,7 +57,8 @@ protected static async Task RunTestWithValues( List expected_normalized_structured, List expected_referenceOnly_normalized, List expected_referenceOnly_structured, - List expected_referenceOnly_normalized_structured + List expected_referenceOnly_normalized_structured, + bool updateExpectedOutput = false ) { try @@ -99,7 +100,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_normalized != null && expected_normalized != null) @@ -109,7 +110,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_referenceOnly != null && expected_referenceOnly != null) @@ -119,7 +120,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_structured != null && expected_structured != null) @@ -129,7 +130,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_normalized_structured != null && expected_normalized_structured != null) @@ -139,7 +140,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_referenceOnly_normalized != null && expected_referenceOnly_normalized != null) @@ -149,7 +150,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_referenceOnly_structured != null && expected_referenceOnly_structured != null) @@ -159,7 +160,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } if (expectedContext_referenceOnly_normalized_structured != null && expected_referenceOnly_normalized_structured != null) @@ -169,7 +170,7 @@ List expected_referenceOnly_normalized_structured outputEntityName = $"{sourceEntityName}_R_{entityFileName}"; outputEntityFileName = $"{outputEntityName}.cdm.json"; resolvedEntityDef = await srcEntityDef.CreateResolvedEntityAsync(outputEntityName, resOpt, outFolder); - await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef); + await SaveActualEntityAndValidateWithExpected(Path.Combine(testExpectedPath, outputEntityFileName), resolvedEntityDef, updateExpectedOutput); } } catch (Exception e) @@ -181,10 +182,14 @@ List expected_referenceOnly_normalized_structured /// /// Runs validation to test actual output vs expected output for attributes collection vs attribute context /// - protected static async Task SaveActualEntityAndValidateWithExpected(string expectedPath, CdmEntityDefinition actualResolvedEntityDef) + protected static async Task SaveActualEntityAndValidateWithExpected(string expectedPath, CdmEntityDefinition actualResolvedEntityDef, bool updateExpectedOutput) { await actualResolvedEntityDef.InDocument.SaveAsAsync(actualResolvedEntityDef.InDocument.Name); string actualPath = actualResolvedEntityDef.Ctx.Corpus.Storage.CorpusPathToAdapterPath(actualResolvedEntityDef.InDocument.AtCorpusPath); + if (updateExpectedOutput) + { + File.WriteAllText(expectedPath, File.ReadAllText(actualPath)); + } Assert.AreEqual( File.ReadAllText(expectedPath), File.ReadAllText(actualPath)); diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceAddInSupportOfTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceAddInSupportOfTest.cs index 34a690d0a3..8351465c64 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceAddInSupportOfTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceAddInSupportOfTest.cs @@ -18,6 +18,7 @@ public class ResolutionGuidanceAddInSupportOfTest : CommonTest [TestMethod] public async Task TestAddInSupportOf() { + bool updateResults = false; string testName = "TestAddInSupportOf"; { string entityName = "Product"; @@ -60,7 +61,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -71,6 +73,7 @@ await RunTestWithValues( [TestMethod] public async Task TestAddInSupportOfWithIsCorrelatedWith() { + bool updateResults = false; string testName = "TestAddInSupportOfWithIsCorrelatedWith"; { string entityName = "Product"; @@ -113,7 +116,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceCardinalityTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceCardinalityTest.cs index 7d3a103e84..ed6bde20c9 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceCardinalityTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceCardinalityTest.cs @@ -18,6 +18,7 @@ public class ResolutionGuidanceCardinalityTest : CommonTest [TestMethod] public async Task TestForeignKeyOneToOneCardinality() { + bool updateResults = false; string testName = "TestForeignKeyOneToOneCardinality"; { string entityName = "Person"; @@ -60,7 +61,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -104,7 +106,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -115,6 +118,8 @@ await RunTestWithValues( [TestMethod] public async Task TestForeignKeyManyToManyCardinality() { + bool updateResults = false; + string testName = "TestForeignKeyManyToManyCardinality"; { string entityName = "Customer"; @@ -157,7 +162,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -201,7 +207,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -245,7 +252,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -256,6 +264,7 @@ await RunTestWithValues( [TestMethod] public async Task TestForeignKeyOneToManyCardinality() { + bool updateResults = false; string testName = "TestForeignKeyOneToManyCardinality"; { string entityName = "Team"; @@ -298,7 +307,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -541,7 +551,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceExpansionAndRenameTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceExpansionAndRenameTest.cs index e037fba6d8..34e1bd4199 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceExpansionAndRenameTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceExpansionAndRenameTest.cs @@ -18,6 +18,7 @@ public class ResolutionGuidanceExpansionAndRenameTest : CommonTest [TestMethod] public async Task TestExpansionAndRenamedOrdinalWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestExpansionAndRenamedOrdinalWithAttributeGroupRef"; { string entityName = "EmployeeAddresses"; @@ -60,7 +61,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -71,6 +73,7 @@ await RunTestWithValues( [TestMethod] public async Task TestExpansionAndRenamedOrdinal23AndAddCount() { + bool updateResults = false; string testName = "TestExpansionAndRenamedOrdinal23AndAddCount"; { string entityName = "EmployeeAddresses"; @@ -113,7 +116,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterInTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterInTest.cs index ca7d43686d..f8139bde64 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterInTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterInTest.cs @@ -17,6 +17,7 @@ public class ResolutionGuidanceFilterInTest : CommonTest [TestMethod] public async Task TestFilterInSome() { + bool updateResults = false; string testName = "TestFilterInSome"; { string entityName = "Employee"; @@ -59,7 +60,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -103,7 +105,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -114,6 +117,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterInSomeWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestFilterInSomeWithAttributeGroupRef"; { string entityName = "Employee"; @@ -156,7 +160,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -200,7 +205,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -211,6 +217,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterInAll() { + bool updateResults = false; string testName = "TestFilterInAll"; { string entityName = "Employee"; @@ -253,7 +260,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -297,7 +305,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -308,6 +317,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterInAllWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestFilterInAllWithAttributeGroupRef"; { string entityName = "Employee"; @@ -350,7 +360,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -394,7 +405,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterOutTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterOutTest.cs index 035a6aafef..d2c669e4f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterOutTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceFilterOutTest.cs @@ -17,6 +17,7 @@ public class ResolutionGuidanceFilterOutTest : CommonTest [TestMethod] public async Task TestFilterOutSome() { + bool updateResults = false; string testName = "TestFilterOutSome"; { string entityName = "Employee"; @@ -59,7 +60,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -103,7 +105,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -114,6 +117,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterOutSomeWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestFilterOutSomeWithAttributeGroupRef"; { string entityName = "Employee"; @@ -156,7 +160,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -200,7 +205,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -211,6 +217,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterOutAll() { + bool updateResults = false; string testName = "TestFilterOutAll"; { string entityName = "Employee"; @@ -253,7 +260,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -297,7 +305,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -308,6 +317,7 @@ await RunTestWithValues( [TestMethod] public async Task TestFilterOutAllWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestFilterOutAllWithAttributeGroupRef"; { string entityName = "Employee"; @@ -350,7 +360,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } { @@ -394,7 +405,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidancePolymorphismTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidancePolymorphismTest.cs index 24c0646aed..7b7e51db9f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidancePolymorphismTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidancePolymorphismTest.cs @@ -18,6 +18,7 @@ public class ResolutionGuidancePolymorphismTest : CommonTest [TestMethod] public async Task TestPolymorphism() { + bool updateResults = false; string testName = "TestPolymorphism"; { string entityName = "Customer"; @@ -62,7 +63,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -73,6 +75,7 @@ await RunTestWithValues( [TestMethod] public async Task TestPolymorphismWithAttributeGroupRef() { + bool updateResults = false; string testName = "TestPolymorphismWithAttributeGroupRef"; { string entityName = "Customer"; @@ -117,7 +120,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } @@ -128,6 +132,7 @@ await RunTestWithValues( [TestMethod] public async Task TestPolymorphismWithRenameAsMember() { + bool updateResults = false; string testName = "TestPolymorphismWithRenameAsMember"; { string entityName = "Customer"; @@ -172,7 +177,8 @@ await RunTestWithValues( expected_normalized_structured, expected_referenceOnly_normalized, expected_referenceOnly_structured, - expected_referenceOnly_normalized_structured + expected_referenceOnly_normalized_structured, + updateResults ); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceTest.cs index 6d65a9f93d..5c5f727e73 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Cdm/ResolutionGuidance/ResolutionGuidanceTest.cs @@ -4,6 +4,7 @@ namespace Microsoft.CommonDataModel.ObjectModel.Tests.Cdm { using Microsoft.CommonDataModel.ObjectModel.Cdm; + using Microsoft.CommonDataModel.ObjectModel.Enums; using Microsoft.CommonDataModel.ObjectModel.Storage; using Microsoft.CommonDataModel.ObjectModel.Utilities; using Microsoft.CommonDataModel.Tools.Processor; @@ -26,6 +27,31 @@ public class ResolutionGuidanceTest /// private static readonly string TestsSubpath = Path.Combine("Cdm", "ResolutionGuidance"); + /// + /// Tests if a warning is logged if resolution guidance is used + /// + /// + [TestMethod] + public async Task TestResolutionGuidanceDeprecation() + { + var corpus = TestHelper.GetLocalCorpus(TestsSubpath, "TestResolutionGuidanceDeprecation"); + + // Tests warning log when resolution guidance is used on a data typed attribute. + var entity = await corpus.FetchObjectAsync("local:/TypeAttribute.cdm.json/Entity"); + await entity.CreateResolvedEntityAsync("res-entity"); + TestHelper.AssertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used on a entity typed attribute. + entity = await corpus.FetchObjectAsync("local:/EntityAttribute.cdm.json/Entity"); + await entity.CreateResolvedEntityAsync("res-entity"); + TestHelper.AssertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used when extending an entity. + entity = await corpus.FetchObjectAsync("local:/ExtendsEntity.cdm.json/Entity"); + await entity.CreateResolvedEntityAsync("res-entity"); + TestHelper.AssertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + } + [TestMethod] public void TestResolutionGuidanceCopy() { diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Persistence/CdmFolder/Manifest/ManifestImplTest.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Persistence/CdmFolder/Manifest/ManifestImplTest.cs index 5832e6ab16..c4f0efd84c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Persistence/CdmFolder/Manifest/ManifestImplTest.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Persistence/CdmFolder/Manifest/ManifestImplTest.cs @@ -3,11 +3,6 @@ namespace Microsoft.CommonDataModel.ObjectModel.Tests.Persistence.CdmFolder { - using System; - using System.Collections.Generic; - using System.IO; - using System.Threading.Tasks; - using Microsoft.CommonDataModel.ObjectModel.Cdm; using Microsoft.CommonDataModel.ObjectModel.Persistence.CdmFolder; using Microsoft.CommonDataModel.ObjectModel.Persistence.CdmFolder.Types; @@ -15,9 +10,10 @@ namespace Microsoft.CommonDataModel.ObjectModel.Tests.Persistence.CdmFolder using Microsoft.CommonDataModel.ObjectModel.Utilities; using Microsoft.CommonDataModel.Tools.Processor; using Microsoft.VisualStudio.TestTools.UnitTesting; - using Newtonsoft.Json; - using Newtonsoft.Json.Linq; + using System; + using System.IO; + using System.Threading.Tasks; [TestClass] public class ManifestImplTest diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json index 4b2bb12b66..c8af66d1eb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "symbolEntityAttribute", "entity": { - "entityReference": "symbolEntity" + "source": "symbolEntity" } } ] diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json index 4bccd86ce4..2363f446fe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "fromEntityAttribute", "entity": { - "entityReference": "fromEntity" + "source": "fromEntity" } } ] diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ForwardCompatibilityTest/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ForwardCompatibilityTest/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt new file mode 100644 index 0000000000..72e754ca66 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ForwardCompatibilityTest/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt @@ -0,0 +1,105 @@ +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count/Resolved_TestAllOperations/hasAttributes/count/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support/Resolved_TestAllOperations/hasAttributes/support/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName/Resolved_TestAllOperations/hasAttributes/type/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/A@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/B@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/C@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/A@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/B@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/C@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3/Resolved_TestAllOperations/hasAttributes/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3/Resolved_TestAllOperations/hasAttributes/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3/Resolved_TestAllOperations/hasAttributes/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A/combined +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined/Resolved_TestAllOperations/hasAttributes/combined/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA/Resolved_TestAllOperations/hasAttributes/NewA/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_TestAllOperations/hasAttributes/A_FK/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/B +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/C +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/count +is.linkedEntity.array.count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/support +is.addedInSupportOf + [Parameter (Name / DefaultValue): inSupportOf / ] + [Argument Value: C] +is.virtual.attribute +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/type +is.linkedEntity.name +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/NewA +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A_FK +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/TestSource.cdm.json/TestSource,A,replaceFK_TestSource] diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 64a36ebe69..5239494af2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,7 +14,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ec454952ae..705379816f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -25,6 +23,9 @@ output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email/Resolved_NewPerson/hasAttributes/PersonAttributeGroup/members/email/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age/Resolved_NewPerson/hasAttributes/age/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/phoneNumber diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 4f0170be17..10d548107c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fbe5e69ceb..dc1df898c4 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed0342ab77..e483ba2d07 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddAttributeGroupTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index bba3a7ad2b..053f314830 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9ac859b512..96031b910d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63e35d480f..f4e2eb25b5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/address @@ -26,10 +24,16 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/new_name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/new_age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/new_address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount/new_someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name/Resolved_NewPerson/hasAttributes/new_name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index fe0a943be1..57c16bb0c5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,11 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt index 12ff168557..4f8dfb0f6c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt index ff3191b029..0a66e586a2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,11 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 2242d30372..adef43a487 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 5784b79231..02649fc140 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,11 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 46a33e42d5..bb8697d6f8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 1796b68a1b..e3930cb4cf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 52fbd75e21..8fb465ecae 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddCountTest/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,8 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 113df5475a..1429f693f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 387cf51fad..ac8a8d5b12 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 85e00ba0d2..93368744c9 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddSupportingAttributeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,13 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt index 901dbaea00..fcb83a949a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt @@ -18,6 +18,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/emailId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone @@ -27,6 +28,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social @@ -36,6 +38,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationCombineAttributes @@ -57,6 +60,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/contactId/new_contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/account +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary/Resolved_Customer/hasAttributes/new_isPrimary/(ref) Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_contactId diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAddTypeTest/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt index 901113431d..4be9f15092 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt @@ -8,8 +8,6 @@ Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityA Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_NestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt index be2ef5e795..9823f1a921 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt @@ -4,8 +4,6 @@ Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAtt Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends/CdmEntity Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute/Resolved_TestEntAttrProj/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/hasAttributes/TestAttribute diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt index 621bbdff6c..73ea0f76d0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt @@ -6,8 +6,6 @@ Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedPr Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt index bd0ee0d0e0..814d044be0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionAttributeContextTest/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt @@ -2,8 +2,6 @@ Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/ext Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute/Resolved_TestEntityProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/hasAttributes/TestAttribute diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionCombineTest/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 56c9ca1d91..55f2d99206 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index e13c431847..6862d18e21 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,36 +4,32 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/age1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/address1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/phoneNumber1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/email1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/name2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/age2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/address2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/phoneNumber2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/email2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/name3 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/address3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/phoneNumber3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/email3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name1 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 6e2d14df45..4bdc8ca315 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 4b41c95d04..6ba7fc48ac 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/address @@ -16,13 +14,12 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure @@ -33,6 +30,7 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/_generatedAttributeSet_template/_generatedAttributeRound0/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAge Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName/Resolved_NewPerson/hasAttributes/PersonInfoName/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAddress diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index 234543d415..8550bf5b79 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt index f9e05b0dec..68621afccf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends/CdmEntity -Resolved_Child/attributeContext/Resolved_Child/extends/Person/phoneNumber -Resolved_Child/attributeContext/Resolved_Child/extends/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/Person/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/Person/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 625b0a7a4d..7d661e88bc 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address @@ -11,6 +9,8 @@ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6a89967584..a212526b27 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 7aa34cf438..903904e129 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name @@ -15,6 +13,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index c36d9dde63..027e4bf78c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed9ac5a1c6..473afb5dec 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -15,9 +13,11 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttr Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 33546136cc..c36c5487ab 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,8 +14,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index 3ce7c5663d..e2b169e510 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -22,8 +22,6 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/Conta Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index e4d8c86a78..ae86ac7875 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -29,9 +29,13 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/proje Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId/Resolved_BusinessPerson/hasAttributes/emailId/(ref) Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt index 340219c676..5ae50a2833 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93a0378283..3513cdb156 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93ddb42189..1d3f746d7b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address @@ -21,6 +19,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 8db35dbc0e..7e8c14168b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExcludeTest/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -3,6 +3,9 @@ Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity Resolved_Person/attributeContext/Resolved_Person/address Resolved_Person/attributeContext/Resolved_Person/address/projection Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_Person/attributeContext/Resolved_Person/name output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) Resolved_Person/attributeContext/Resolved_Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 85b0b16f15..56b912d14b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index fba97959fb..1e1d1b2d2f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -6,15 +6,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/project Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d5835ac6a..6c64c2fba6 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -8,8 +8,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/address @@ -18,10 +16,15 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name @@ -34,8 +37,34 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1/name1 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 1d9a8fec7b..ab08ce5691 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index a1ab17f96e..c89b71b328 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,9 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d483f37ee..dc353d7f95 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/proje Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 2dee2a32b1..e8be825363 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,9 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index b4f6d6a15c..e5929f6606 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 3b0394191b..aea14a2abd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index e2a448d6d9..e9f820c691 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -10,8 +10,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index efcd7768c1..e7125e5f4c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -2,14 +2,8 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count/Resolved_BusinessPerson/hasAttributes/count/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt deleted file mode 100644 index 4c82eda2fc..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/extends -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/extends/CdmEntity -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_default/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_default/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_default/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_default/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_default/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_default/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_default/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_default/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/attributeContext/Resolved_ThreeMusketeers_default/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_default/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_default.cdm.json/Resolved_ThreeMusketeers_default/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt deleted file mode 100644 index 72157e601f..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/extends -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/extends/CdmEntity -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_normalized/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_normalized/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_normalized/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_normalized/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_normalized/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_normalized/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_normalized/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_normalized/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/attributeContext/Resolved_ThreeMusketeers_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_normalized/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized.cdm.json/Resolved_ThreeMusketeers_normalized/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt deleted file mode 100644 index 42e73baeb5..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/extends -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/extends/CdmEntity -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/attributeContext/Resolved_ThreeMusketeers_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_normalized_structured.cdm.json/Resolved_ThreeMusketeers_normalized_structured/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly.txt deleted file mode 100644 index 5e215d2389..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/extends -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/attributeContext/Resolved_ThreeMusketeers_referenceOnly/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly.cdm.json/Resolved_ThreeMusketeers_referenceOnly/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt deleted file mode 100644 index 9344c011fa..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/extends -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt deleted file mode 100644 index 59bd2c6718..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/extends -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_normalized_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_normalized_structured/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_structured.txt deleted file mode 100644 index abd7bbd98d..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_structured.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/extends -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/attributeContext/Resolved_ThreeMusketeers_referenceOnly_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_referenceOnly_structured.cdm.json/Resolved_ThreeMusketeers_referenceOnly_structured/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_structured.txt deleted file mode 100644 index 1c9adabe92..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/ExpectedOutput/AttrCtx_ThreeMusketeers_structured.txt +++ /dev/null @@ -1,104 +0,0 @@ -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/extends -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/extends/CdmEntity -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person/name -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person/age -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/projection/source/Person/address -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@1/name1/Resolved_ThreeMusketeers_structured/hasAttributes/name1/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@2/name2/Resolved_ThreeMusketeers_structured/hasAttributes/name2/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/name@3/name3/Resolved_ThreeMusketeers_structured/hasAttributes/name3/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1/Resolved_ThreeMusketeers_structured/hasAttributes/age1/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2/Resolved_ThreeMusketeers_structured/hasAttributes/age2/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3/Resolved_ThreeMusketeers_structured/hasAttributes/age3/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1/Resolved_ThreeMusketeers_structured/hasAttributes/address1/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2/Resolved_ThreeMusketeers_structured/hasAttributes/address2/(ref) -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 -Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/attributeContext/Resolved_ThreeMusketeers_structured/ThreePeople/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3/Resolved_ThreeMusketeers_structured/hasAttributes/address3/(ref) -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/name1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/age1 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/address1 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/name2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/age2 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/address2 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/name3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/age3 -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_ThreeMusketeers_structured.cdm.json/Resolved_ThreeMusketeers_structured/hasAttributes/address3 -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/Person.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/Person.cdm.json deleted file mode 100644 index ae9c13aee8..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/Person.cdm.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", - "jsonSchemaSemanticVersion": "1.1.0", - "imports": [ - { - "corpusPath": "_allImports.cdm.json" - } - ], - "definitions": [ - { - "entityName": "Person", - "extendsEntity": "CdmEntity", - "hasAttributes": [ - { - "name": "name", - "dataType": "string" - }, - { - "name": "age", - "dataType": "integer" - }, - { - "name": "address", - "dataType": "string" - } - ] - } - ] -} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/ThreeMusketeers.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/ThreeMusketeers.cdm.json deleted file mode 100644 index e19ce0bb4e..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/ThreeMusketeers.cdm.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", - "jsonSchemaSemanticVersion": "1.1.0", - "imports": [ - { - "corpusPath": "_allImports.cdm.json" - } - ], - "definitions": [ - { - "entityName": "ThreeMusketeers", - "extendsEntity": "CdmEntity", - "hasAttributes": [ - { - "name": "ThreePeople", - "entity": { - "operations": [ - { - "$type": "renameAttributes", - "renameFormat": "{m}{o}" - } - ], - "source": { - "operations": [ - { - "$type": "arrayExpansion", - "startOrdinal": 1, - "endOrdinal": 3 - } - ], - "source": "Person" - } - } - } - ] - } - ] -} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/_allImports.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/_allImports.cdm.json deleted file mode 100644 index 52bd00b559..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/_allImports.cdm.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", - "jsonSchemaSemanticVersion": "1.1.0", - "imports": [ - { - "corpusPath": "cdm:/foundations.cdm.json" - }, - { - "corpusPath": "Person.cdm.json" - }, - { - "corpusPath": "ThreeMusketeers.cdm.json" - } - ] -} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/default.manifest.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/default.manifest.cdm.json deleted file mode 100644 index d57bb42ca1..0000000000 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProj/Input/default.manifest.cdm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", - "jsonSchemaSemanticVersion": "1.1.0", - "manifestName": "default.manifest.cdm.json", - "entities": [ - { - "type": "LocalEntity", - "entityName": "Person", - "entitySchema": "Person.cdm.json/Person" - }, - { - "type": "LocalEntity", - "entityName": "ThreeMusketeers", - "entitySchema": "ThreeMusketeers.cdm.json/ThreeMusketeers" - } - ] -} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index d0cfd18e37..153f9f0498 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 451f798133..956998c967 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionExpansionTest/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 886c0b69ab..c4d1e41357 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 0d82aa406e..397a36fe71 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -4,14 +4,7 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt index 7ba825ce11..d1b9eb3648 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt @@ -6,11 +6,6 @@ Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesComp Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends/CdmEntity -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId1 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId2 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductName Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt index d31b13c0ed..f6df6e1030 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt @@ -4,8 +4,6 @@ Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/Pro Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesEntityAttribute.cdm.json/Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId/Resolved_SalesEntityAttribute/hasAttributes/ProductId/(ref) Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt index da5e883690..13ec6bfbcd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt @@ -6,10 +6,6 @@ Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignK Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends/CdmEntity -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductId -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductName Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt index 58af7e7a06..ec1e398a75 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt @@ -6,12 +6,6 @@ Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProd Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends/CdmEntity -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductId -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductName Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt index c3364db34b..0e9d939e6f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt @@ -14,10 +14,6 @@ Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyPr Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductId -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductName Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt index 635a1ff340..f7190014d0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt @@ -6,30 +6,6 @@ Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSo Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/emailId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/address -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/phoneId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/number -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/socialId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/account -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/userId Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt index 0e68c393b3..3fb817b20e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/_generatedAttributeSet_template diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionFKTest/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt index ab8e8fee6e..a97f3125d5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt index 03d878aa31..7565883fd2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt @@ -4,22 +4,24 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount/Resolved_Sales/hasAttributes/ThreeProductsBoughtProductCount/(ref) Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt index d6715c3692..51c0b10a5b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_default.txt index be98618843..1e26c2d143 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_default.txt @@ -5,7 +5,6 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/Color.cdm.json index 2ba9ad4d7d..ecb74df2b3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEA/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt index 0d47ce3fcd..22ebf8885d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -10,6 +10,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Bl Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/Color.cdm.json index 41552fc2fa..dae1745ae1 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEAProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt index c09cc5b7be..a9e2baa382 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,9 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/Color.cdm.json index 5abcebb4b5..2daa8013bd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmpty/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt index eaddf1ea34..3a9f533f8f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -6,6 +6,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Re Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Blue Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/Color.cdm.json index 7fff0c62f7..97e0fb9419 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestEmptyProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt index 50305e8aa7..37d015bfd5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,6 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/extends Resolved_Color/attributeContext/Resolved_Color/extends/RGB -Resolved_Color/attributeContext/Resolved_Color/extends/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/Color.cdm.json index 6e21fa79e7..1f09b811ce 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtends/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt index aeace0b5f7..9ac59f31dd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -8,6 +8,7 @@ Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/Blu Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/Color.cdm.json index 336dd1359e..d60c3a3c6e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestExtendsProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt index fbcfdd01d7..3eb421bd9a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt @@ -1,12 +1,9 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Blue -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupName/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt index e5384d5c2b..e48ae8c044 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt @@ -12,9 +12,14 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/sourc Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Blue +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorGreen +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorIsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed output:/Resolved_Product.cdm.json/Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed/Resolved_Product/hasAttributes/RGBColorRed/(ref) Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorBlue diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestGroupNameProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/Color.cdm.json index d20b08d8db..dd877c2f25 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 1dc4c8a2be..5c569d0d07 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/Color.cdm.json index b63a983b03..98b1b331dc 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested1of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 666afef429..0c63cfe79d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/Color.cdm.json index b897cbb23b..402eb1c49c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested2of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index ad53e24427..951fab6abe 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/Color.cdm.json index 8ad4a22f97..044f7e906d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNested3of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt index 376e456b6a..b633133155 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -13,9 +13,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Blue diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/Color.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/Color.cdm.json index 2dc0d4b84f..cb1c157e1a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestNestedIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt index dccb87fae9..cac7796e75 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt @@ -6,28 +6,19 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt index 06cc3332e2..dac5f713c5 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -14,7 +14,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId @@ -23,7 +26,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId @@ -32,9 +38,17 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address/Resolved_Person/hasAttributes/address/(ref) Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionIncludeTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 2e18a46eed..c2c21e4a44 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 5a6f7c15c7..9041edb2de 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index bbe19ae0b1..3918bddf01 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9e61059ac5..fbb20f9752 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 87814dadf3..f524413365 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fb1d9ada27..486536056a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6726bb4db2..b4a66a23bd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 268ac036c4..f35d5b47f7 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 8fa72f3167..44527c5129 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -17,12 +15,19 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/PersonInfo--Name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/PersonInfo--Age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/PersonInfo--Address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email/PersonInfo--Email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name/Resolved_NewPerson/hasAttributes/PersonInfo--Name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 415417f2cf..5879d287e1 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index e3a281f24d..8dfa526d62 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Projection/ProjectionRenameTest/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index 3aa72deebc..a440fca681 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,name,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,number,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index bbdf2b7560..7562f5c719 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Address.cdm.json/Address,name,something_Address] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Phone.cdm.json/Phone,number,something_Phone] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 94997e5824..83436a8455 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,11 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -25,6 +20,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -37,6 +38,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt index be6fe66d8a..cf2989287d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 73db8ce2d9..dc4b8c111e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -8,11 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/proje Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -29,6 +24,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -41,6 +42,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt index 3006759dc1..d34d706446 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt @@ -2,24 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -38,6 +20,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,isPrimary,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,isPrimary,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,isPrimary,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -52,6 +40,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,userId,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,userId,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,userId,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt index 82607e3c41..5e2521d4aa 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Relationship/CalculateRelationshipTest/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt new file mode 100644 index 0000000000..ff26b6ceb0 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt @@ -0,0 +1,44 @@ +Resolved_Sales/attributeContext/Resolved_Sales/extends +Resolved_Sales/attributeContext/Resolved_Sales/extends/CdmEntity +Resolved_Sales/attributeContext/Resolved_Sales/SalesName +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SalesName/Resolved_Sales/hasAttributes/SalesName/(ref) +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_Sales/hasAttributes/FKId1/(ref) +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/SalesName +is.dataFormat.numeric.shaped + [Parameter (Name / DefaultValue): precision / ] + [Argument Value: 15] + [Parameter (Name / DefaultValue): scale / ] + [Argument Value: -1] +has.description + [Parameter (Name / DefaultValue): description / ] + [Argument Value: en,testing purpose trait on a type attribute.] +means.idea.project +means.idea.scenario +is.dataFormat.numeric.shaped +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/FKId1 +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.guid +means.identity.entityId +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] +means.idea.project +means.idea.scenario +is.dataFormat.guid +is.dataFormat.character +is.dataFormat.array diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json new file mode 100644 index 0000000000..c45eaa3b90 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Product", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "purpose": "hasA", + "dataType": "integer", + "name": "ProductId1" + }, + { + "purpose": "hasA", + "dataType": "string", + "name": "ProductName" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json new file mode 100644 index 0000000000..ad4113ca02 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json @@ -0,0 +1,125 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Sales", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "dataType": { + "dataTypeReference": "decimal", + "appliedTraits": [ + { + "traitReference": "is.dataFormat.numeric.shaped", + "arguments": [ + { + "name": "precision", + "value": "15" + }, + { + "name": "scale", + "value": "-1" + } + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "has.description", + "arguments": [ + { + "entityReference": { + "entityShape": "localizedTable", + "constantValues": [ + [ + "en", + "testing purpose trait on a type attribute." + ] + ] + } + } + ] + } + ] + }, + "name": "SalesName" + }, + { + "name": "SaleEAKey", + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "means.forward", + "arguments": [ + "Description for the forward direction in the relationship." + ] + }, + { + "traitReference": "means.backward", + "arguments": [ + "Description for the backward direction in the relationship." + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "entity": { + "source": "Product", + "operations": [ + { + "$type": "replaceAsForeignKey", + "reference": "ProductId1", + "replaceWith": { + "dataType": "entityId", + "name": "FKId1" + } + } + ] + } + } + ], + "version": "1.0" + }, + { + "traitName": "means.backward", + "explanation": "the attribute represents B->A.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship B->A", + "required": false + } + ] + }, + { + "traitName": "means.forward", + "explanation": "the attribute represents A->B.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship A->B", + "required": false + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json new file mode 100644 index 0000000000..4cd76e31b8 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "Product.cdm.json" + }, + { + "corpusPath": "Sales.cdm.json" + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json new file mode 100644 index 0000000000..d06466170d --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json @@ -0,0 +1,25 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "manifestName": "default.manifest.cdm.json", + "entities": [ + { + "type": "LocalEntity", + "entityName": "Product", + "entityPath": "Product.cdm.json/Product" + }, + { + "type": "LocalEntity", + "entityName": "Sales", + "entityPath": "Sales.cdm.json/Sales" + } + ], + "relationships": [ + { + "fromEntity": "Sales.cdm.json/Sales", + "fromEntityAttribute": "FKId1", + "toEntity": "Product.cdm.json/Product", + "toEntityAttribute": "ProductId1" + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json index 2ef1eb5784..29b947442f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json index c2da629550..2eff10ee55 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json index 0f938a4a36..22d15ac65c 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json index af96808ed2..bfb4485561 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json index dff3f6147e..90c23a96e1 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json index d4ee3dbe36..fc80aac5ee 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json index 314961644e..12ae311867 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json index bdab351b98..8dc80c5cb3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json index 12afc9b331..e3bd3da3e9 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json index dcd16efa20..60040eb927 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json index 07c2a2c9f9..10a9532a4b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 80ea91d739..f17924da7a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index b258be494d..73bdffd856 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json index d4b94e554d..a475805158 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json index 25b655e7cc..fd84afd06d 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json index cbfc41709a..fd4ea7b661 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json index d9ca2d6d63..e26bb42242 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json index 05a8bb669b..b989b31d3b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json index fc51aa8e8c..24d35953a8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 768de2b532..e5ae1cfbf8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index c5f5e60663..35faae3fa2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json index 75533f8e6f..9bd71dc416 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json index 95dcdd0196..2f060f5684 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json index 955ab116d0..21791175a1 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json index 12afc9b331..e3bd3da3e9 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json index dcd16efa20..60040eb927 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 80ea91d739..f17924da7a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index b258be494d..73bdffd856 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json index d9ca2d6d63..e26bb42242 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json index 05a8bb669b..b989b31d3b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 768de2b532..e5ae1cfbf8 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index c5f5e60663..35faae3fa2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json index 80cad90dfb..872cff092b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -158,21 +144,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json index c320b9c6b3..29e7d168e0 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -142,21 +128,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json index 4865ec3c27..da9fb35c6f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -142,21 +128,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json index 88d5936917..40d69df432 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json @@ -103,21 +103,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json index fba7d3d38e..5d22e6ac8a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json index ec998ece7a..d6ac286d5a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json new file mode 100644 index 0000000000..1a293e720c --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "BaseEntity", + "hasAttributes": [ + { + "name": "email", + "dataType": "string" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json new file mode 100644 index 0000000000..ac2905871f --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json new file mode 100644 index 0000000000..a17c5abad9 --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "extendsEntity": "BaseEntity", + "extendsEntityResolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + }, + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json new file mode 100644 index 0000000000..d04d2cd88e --- /dev/null +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "dataType": "string", + "resolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json index 2c3c2dc79b..78df83e540 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json @@ -1589,7 +1589,7 @@ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Account/(resolvedAttributes)/stateCode" + "resolvedFrom/base_Address/Account/(resolvedAttributes)/stateCode" ] } ] @@ -1600,30 +1600,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1638,12 +1614,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1658,48 +1628,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1809,150 +1737,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json index 932dd18460..9af3e9bdef 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json @@ -1682,30 +1682,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1720,12 +1696,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1740,48 +1710,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1891,150 +1819,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json index b3fa2ebccd..5277f116da 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json @@ -1619,30 +1619,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1657,12 +1633,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1677,48 +1647,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1828,150 +1756,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json index 00838d70c8..0b81021bdc 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json @@ -75,33 +75,7 @@ "type": "entity", "name": "Address", "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source", - "definition": "resolvedFrom/Address", - "contents": [ - { - "type": "attributeDefinition", - "name": "addressLine", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/addressLine" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/postalCode" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/city" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/country" - } - ] + "definition": "resolvedFrom/Address" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json index 80d8e222ab..78df83e540 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/TestData/Samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json @@ -1600,30 +1600,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1638,12 +1614,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1658,48 +1628,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1809,150 +1737,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Utilities/ProjectionTestUtils.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Utilities/ProjectionTestUtils.cs index 920f1c0197..e565b77e76 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Utilities/ProjectionTestUtils.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Tests/Utilities/ProjectionTestUtils.cs @@ -25,6 +25,14 @@ class ProjectionTestUtils /// private const string foundationJsonPath = "cdm:/foundations.cdm.json"; + /// + /// The log codes that are allowed to be logged without failing the test + /// + private static readonly HashSet allowedLogs = new HashSet() + { + CdmLogCode.WarnDeprecatedResolutionGuidance.ToString() + }; + /// /// Resolves an entity /// @@ -74,7 +82,7 @@ public static string GetResolutionOptionNameSuffix(List directives, stri /// /// Loads an entity, resolves it, and then validates the generated attribute contexts. /// - public static async Task LoadEntityForResolutionOptionAndSave(CdmCorpusDefinition corpus, string testName, string testsSubpath, string entityName, List directives) + public static async Task LoadEntityForResolutionOptionAndSave(CdmCorpusDefinition corpus, string testName, string testsSubpath, string entityName, List directives, bool updateExpectedOutput = false) { string expectedOutputPath = TestHelper.GetExpectedOutputFolderPath(testsSubpath, testName); @@ -83,7 +91,7 @@ public static async Task LoadEntityForResolutionOptionAndSa CdmEntityDefinition resolvedEntity = await GetResolvedEntity(corpus, entity, directives); Assert.IsNotNull(resolvedEntity); - await ValidateAttributeContext(directives, expectedOutputPath, entityName, resolvedEntity); + await ValidateAttributeContext(directives, expectedOutputPath, entityName, resolvedEntity, updateExpectedOutput); return resolvedEntity; } @@ -99,7 +107,12 @@ public static CdmCorpusDefinition GetLocalCorpus(string testsSubpath, string tes { Invoke = (status, message) => { - Assert.Fail(message); + var events = corpus.Ctx.Events; + var lastLog = events[events.Count - 1]; + if (!lastLog.ContainsKey("code") || !allowedLogs.Contains(lastLog["code"])) + { + Assert.Fail(message); + } } }, CdmStatusLevel.Warning); diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttribute.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttribute.cs index ee4e133d20..2bf6bf8a00 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttribute.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttribute.cs @@ -27,6 +27,7 @@ public abstract class CdmAttribute : CdmObjectDefinitionBase, CdmAttributeItem /// /// Gets or sets the attribute's resolution guidance. /// + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public CdmAttributeResolutionGuidance ResolutionGuidance { get; set; } /// @@ -70,6 +71,7 @@ public override string GetName() return this.Name; } + [Obsolete("For internal use only.")] public abstract ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null); internal bool VisitAtt(string pathFrom, VisitCallback preChildren, VisitCallback postChildren) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeContext.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeContext.cs index 5d40508bad..7f337c2573 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeContext.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeContext.cs @@ -110,7 +110,7 @@ public CdmObject CopyNode(ResolveOptions resOpt) if (this.Lineage != null) { - foreach(var lin in this.Lineage) + foreach (var lin in this.Lineage) { copy.AddLineage(lin.ExplicitReference, false); // use explicitref to cause new ref to be allocated } @@ -206,7 +206,7 @@ public override bool Validate() if (missingFields.Count > 0) { - Logger.Error(this.Ctx, Tag, nameof(Validate), this.AtCorpusPath, CdmLogCode.ErrValdnIntegrityCheckFailure, this.AtCorpusPath, string.Join(", ", missingFields.Select((s) =>$"'{s}'"))); + Logger.Error(this.Ctx, Tag, nameof(Validate), this.AtCorpusPath, CdmLogCode.ErrValdnIntegrityCheckFailure, this.AtCorpusPath, string.Join(", ", missingFields.Select((s) => $"'{s}'"))); return false; } return true; @@ -554,7 +554,7 @@ internal bool FinalizeAttributeContext(ResolveOptions resOpt, string pathStart, } foundDocPaths[docFrom] = pathBetweenDocs; } - + (ac.Definition as CdmObjectReferenceBase).LocalizePortableReference($"{monikerForDocFrom}{pathBetweenDocs}"); } } @@ -646,6 +646,229 @@ internal bool FinalizeAttributeContext(ResolveOptions resOpt, string pathStart, return true; } + + internal void CollectContextFromAtts(ResolvedAttributeSet rasSub, HashSet collected) + { + rasSub.Set.ForEach(ra => + { + var raCtx = ra.AttCtx; + collected.Add(raCtx); + + // the target for a resolved att can be a TypeAttribute OR it can be another ResolvedAttributeSet (meaning a group) + if (ra.Target is ResolvedAttributeSet) + { + // a group + CollectContextFromAtts(ra.Target as ResolvedAttributeSet, collected); + } + }); + } + + + internal bool PruneToScope(HashSet scopeSet) + { + // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set + // (so base entity chains, entity attributes entity definitions) + + // for testing, don't delete this + //Func CountNodes = null; + //CountNodes = (subItem) => + //{ + // if (!(subItem is CdmAttributeContext)) + // { + // return 1; + // } + // CdmAttributeContext ac = subItem as CdmAttributeContext; + // if (ac.Contents == null || ac.Contents.Count == 0) + // { + // return 1; + // } + // // look at all children + // long total = 0; + // foreach (var subSub in ac.Contents) + // { + // total += CountNodes(subSub); + // } + // return 1 + total; + //}; + //System.Diagnostics.Debug.WriteLine($"Pre Prune {CountNodes(this)}"); + + + // so ... the change from the old behavior is to depend on the lineage pointers to save the attribute defs + // in the 'structure' part of the tree that might matter. keep all of the other structure info and keep some + // special nodes (like the ones that have removed attributes) that won't get found from lineage trace but that are + // needed to understand what took place in resolution + HashSet nodesToSave = new HashSet(); + + // helper that save the passed node and anything up the parent chain + Func SaveParentNodes = null; + SaveParentNodes = (currNode) => + { + if (nodesToSave.Contains(currNode)) + { + return true; + } + nodesToSave.Add(currNode); + // get the parent + if (currNode.Parent?.ExplicitReference != null) + { + return SaveParentNodes(currNode.Parent.ExplicitReference as CdmAttributeContext); + } + return true; + }; + + // helper that saves the current node (and parents) plus anything in the lineage (with their parents) + Func SaveLineageNodes = null; + SaveLineageNodes = (currNode) => + { + if (!SaveParentNodes(currNode)) + { + return false; + } + if (currNode.Lineage != null && currNode.Lineage.Count > 0) + { + foreach (var lin in currNode.Lineage) + { + if (lin.ExplicitReference != null) + { + if (!SaveLineageNodes(lin.ExplicitReference as CdmAttributeContext)) + { + return false; + } + } + } + } + return true; + }; + + + Func SaveStructureNodes = null; + SaveStructureNodes = (subItem, inGenerated, inProjection, inRemove) => + { + if (!(subItem is CdmAttributeContext)) + { + return true; + } + + CdmAttributeContext ac = subItem as CdmAttributeContext; + if (ac.Type == CdmAttributeContextType.GeneratedSet) + { + inGenerated = true; // special mode where we hate everything except the removed att notes + } + + if (inGenerated && (ac.Type == CdmAttributeContextType.OperationExcludeAttributes || ac.Type == CdmAttributeContextType.OperationIncludeAttributes)) + { + inRemove = true; // triggers us to know what to do in the next code block. + } + bool removedAttribute = false; + if (ac.Type == CdmAttributeContextType.AttributeDefinition) + { + // empty attribute nodes are descriptions of source attributes that may or may not be needed. lineage will sort it out. + // the exception is for attribute descriptions under a remove attributes operation. they are gone from the resolved att set, so + // no history would remain + if (inRemove) + { + removedAttribute = true; + } + else if (ac.Contents == null || ac.Contents.Count == 0) + { + return true; + } + } + + if (!inGenerated || removedAttribute) + { + // mark this as something worth saving, sometimes + // these get discovered at the leaf of a tree that we want to mostly ignore, so can cause a + // discontinuity in the 'save' chains, so fix that + SaveLineageNodes(ac); + } + + if (ac.Type == CdmAttributeContextType.Projection) + { + inProjection = true; // track this so we can do the next thing ... + } + if (ac.Type == CdmAttributeContextType.Entity && inProjection) + { + // this is far enough, the entity that is somewhere under a projection chain + // things under this might get saved through lineage, but down to this point will get in for sure + return true; + } + + if (ac.Contents == null || ac.Contents.Count == 0) + { + return true; + } + // look at all children + foreach (var subSub in ac.Contents) + { + if (!SaveStructureNodes(subSub, inGenerated, inProjection, inRemove)) + { + return false; + } + } + return true; + }; + + if (!SaveStructureNodes(this, false, false, false)) + { + return false; + } + + // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save + // also mark any parents of those as savers + + // so, do that ^^^ for every primary context found earlier + foreach (var primCtx in scopeSet) + { + if (!SaveLineageNodes(primCtx)) + { + return false; + } + } + + // now the cleanup, we have a set of the nodes that should be saved + // run over the tree and re-build the contents collection with only the things to save + Func CleanSubGroup = null; + CleanSubGroup = (subItem) => + { + if (subItem.ObjectType == CdmObjectType.AttributeRef) + { + return true; // not empty + } + + CdmAttributeContext ac = subItem as CdmAttributeContext; + + if (!nodesToSave.Contains(ac)) + { + return false; // don't even look at content, this all goes away + } + + if (ac.Contents != null && ac.Contents.Count > 0) + { + // need to clean up the content array without triggering the code that fixes in document or paths + var newContent = new List(); + foreach (var sub in ac.Contents) + { + // true means keep this as a child + if (CleanSubGroup(sub)) + { + newContent.Add(sub); + } + } + // clear the old content and replace + ac.Contents.Clear(); + ac.Contents.AddRange(newContent); + } + + return true; + }; + CleanSubGroup(this); + + //System.Diagnostics.Debug.WriteLine($"Post Prune {CountNodes(this)}"); + + return true; + } + internal bool ValidateLineage(ResolveOptions resOpt) { // run over the attCtx tree and validate that it is self consistent on lineage @@ -711,7 +934,7 @@ internal bool ValidateLineage(ResolveOptions resOpt) { if (subSub.ObjectType == CdmObjectType.AttributeContextDef) { - if (CheckLineage(subSub) == false) + if (!CheckLineage(subSub)) { return false; } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupDefinition.cs index 0c8f41034b..d7b8c2fe47 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupDefinition.cs @@ -110,6 +110,7 @@ internal CdmAttributeItem AddAttributeDef(CdmAttributeItem attributeDef) return attributeDef; } + [Obsolete("For internal use only.")] public ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null) { if (resOpt == null) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupReference.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupReference.cs index e8337aa5d0..9ffd537c1a 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupReference.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeGroupReference.cs @@ -61,6 +61,7 @@ internal override bool VisitRef(string pathFrom, VisitCallback preChildren, Visi return false; } + [Obsolete("For internal use only.")] public ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null) { if (resOpt == null) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeResolutionGuidance.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeResolutionGuidance.cs index 5ef5081f9b..60ac5671f6 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeResolutionGuidance.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmAttributeResolutionGuidance.cs @@ -8,6 +8,7 @@ namespace Microsoft.CommonDataModel.ObjectModel.Cdm using System; using System.Collections.Generic; + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public class CdmAttributeResolutionGuidance : CdmObjectSimple { /// @@ -43,6 +44,7 @@ public class CdmAttributeResolutionGuidance : CdmObjectSimple /// /// Parameters that control array expansion if inline repeating of attributes is needed. /// + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public class Expansion { /// @@ -69,6 +71,7 @@ public Expansion makeExpansion() /// /// Parameters that control the use of foreign keys to reference entity instances instead of embedding the entity in a nested way. /// + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public class CdmAttributeResolutionGuidance_EntityByReference { /// @@ -100,6 +103,7 @@ public CdmAttributeResolutionGuidance_EntityByReference makeEntityByReference() /// /// Used to indicate that this attribute select either 'one' or 'all' of the sub-attributes from an entity. If the 'structured' directive is set, this trait causes resolved attributes to end up in groups rather than a flattend list. /// + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public class CdmAttributeResolutionGuidance_SelectsSubAttribute { /// diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmCorpusDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmCorpusDefinition.cs index e63b5a232d..1fd4e12247 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmCorpusDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmCorpusDefinition.cs @@ -264,15 +264,18 @@ internal CdmObjectBase ResolveSymbolReference(ResolveOptions resOpt, CdmDocument { return null; // no way to figure this out } - CdmDocumentDefinition wrtDoc = resOpt.WrtDoc as CdmDocumentDefinition; + CdmDocumentDefinition wrtDoc = resOpt.WrtDoc; - var indexTask = Task.Run(async () => await wrtDoc.IndexIfNeeded(resOpt, true)); - - // if the wrtDoc needs to be indexed (like it was just modified) then do that first - if (!indexTask.Result) + if (wrtDoc.NeedsIndexing && !wrtDoc.CurrentlyIndexing) { - Logger.Error(ctx, Tag, nameof(ResolveSymbolReference), wrtDoc.AtCorpusPath, CdmLogCode.ErrIndexFailed); - return null; + var indexTask = Task.Run(async () => await wrtDoc.IndexIfNeeded(resOpt, true)); + + // if the wrtDoc needs to be indexed (like it was just modified) then do that first + if (!indexTask.Result) + { + Logger.Error(ctx, Tag, nameof(ResolveSymbolReference), wrtDoc.AtCorpusPath, CdmLogCode.ErrIndexFailed); + return null; + } } if (wrtDoc.NeedsIndexing && resOpt.ImportsLoadStrategy == ImportsLoadStrategy.DoNotLoad) @@ -523,10 +526,25 @@ internal string CreateDefinitionCacheTag(ResolveOptions resOpt, CdmObjectBase de StringBuilder tagSuffix = new StringBuilder(); tagSuffix.AppendFormat("-{0}-{1}", kind, thisId); tagSuffix.AppendFormat("-({0})", resOpt.Directives != null ? resOpt.Directives.GetTag() : string.Empty); - if (resOpt.DepthInfo.MaxDepthExceeded) + // only for attributes + if (kind == "rasb") { - DepthInfo currDepthInfo = resOpt.DepthInfo; - tagSuffix.AppendFormat("-${0}", currDepthInfo.MaxDepth - currDepthInfo.CurrentDepth); + // if MaxDepth was not initialized before, initialize it now + if (resOpt.DepthInfo.MaxDepth == null) + { + resOpt.DepthInfo.MaxDepth = resOpt.MaxDepth; + } + + // add to the cache tag either if we reached maximum depth or how many levels we can go down until reaching the maximum depth + if (resOpt.DepthInfo.CurrentDepth > resOpt.DepthInfo.MaxDepth) + { + tagSuffix.Append("-overMaxDepth"); + } + else + { + DepthInfo currDepthInfo = resOpt.DepthInfo; + tagSuffix.AppendFormat("-{0}toMaxDepth", currDepthInfo.MaxDepth - currDepthInfo.CurrentDepth); + } } if (resOpt.InCircularReference) { diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityAttributeDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityAttributeDefinition.cs index 981171f740..4c0b1704dd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityAttributeDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityAttributeDefinition.cs @@ -276,11 +276,15 @@ internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(Resolv ProjectionContext projCtx = projDef.ConstructProjectionContext(projDirective, under); rasb.ResolvedAttributeSet = projDef.ExtractResolvedAttributes(projCtx, under); + // from the traits of purpose and applied here + rasb.ResolvedAttributeSet.ApplyTraits(this.FetchResolvedTraits(resOpt)); } } else { - // An Entity Reference + // Resolution guidance + + resOpt.UsedResolutionGuidance = true; AttributeResolutionContext arc = this.FetchAttResContext(resOpt); RelationshipInfo relInfo = arc.GetRelationshipInfo(); @@ -477,6 +481,7 @@ internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(Resolv } // the only thing we need this code for is testing!!! + [Obsolete("For internal use only.")] public override ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null) { if (resOpt == null) diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityDefinition.cs index 8f474e1514..1fed2347b2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmEntityDefinition.cs @@ -37,6 +37,7 @@ public CdmEntityReference ExtendsEntity /// /// Gets or sets the resolution guidance for attributes taken from the entity extended by this entity. /// + [Obsolete("Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview")] public CdmAttributeResolutionGuidance ExtendsEntityResolutionGuidance { get; set; } /// @@ -249,6 +250,7 @@ public override CdmObjectType GetObjectType() return CdmObjectType.EntityDef; } + [Obsolete("For internal use only.")] public ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null) { bool wasPreviouslyResolving = this.Ctx.Corpus.isCurrentlyResolving; @@ -297,7 +299,7 @@ public ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions r for (int i = 0; i < this.Attributes.Count; i++) { // if dynamic refs come back from attributes, they don't know who we are, so they don't set the entity - dynamic sub = this.Attributes.AllItems[i].FetchResolvedEntityReferences(resOpt); + dynamic sub = this.Attributes[i].FetchResolvedEntityReferences(resOpt); if (sub != null) { foreach (var res in sub.Set) @@ -412,6 +414,8 @@ private Task> QueryOnTraitsAsync(dynamic querySpec) internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(ResolveOptions resOpt, CdmAttributeContext under = null) { + //System.Diagnostics.Debug.WriteLine($"{this.EntityName}({resOpt.DepthInfo.CurrentDepth}/{resOpt.DepthInfo.MaxDepth})"); + // find and cache the complete set of attributes // attributes definitions originate from and then get modified by subsequent re-definitions from (in this order): // an extended entity, traits applied to extended entity, exhibited traits of main entity, the (datatype or entity) used as an attribute, traits applied to that datatype or entity, @@ -490,6 +494,8 @@ internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(Resolv if (this.ExtendsEntityResolutionGuidance != null) { + resOpt.UsedResolutionGuidance = true; + // some guidance was given on how to integrate the base attributes into the set. apply that guidance ResolvedTraitSet rtsBase = this.FetchResolvedTraits(resOpt); @@ -661,6 +667,11 @@ public async Task CreateResolvedEntityAsync(string newEntNa // points to the level of the context where it was last modified, merged, created var ras = this.FetchResolvedAttributes(resOptCopy, acpEnt); + if (resOptCopy.UsedResolutionGuidance) + { + Logger.Warning(ctx, Tag, nameof(CreateResolvedEntityAsync), this.AtCorpusPath, CdmLogCode.WarnDeprecatedResolutionGuidance); + } + if (ras == null) { return null; @@ -696,11 +707,11 @@ public async Task CreateResolvedEntityAsync(string newEntNa //Action testResolveAttributeCtx = null; //testResolveAttributeCtx = (rasSub) => //{ - // if (rasSub.Set.Count != 0 && rasSub.AttributeContext.AtCoprusPath.StartsWith("cacheHolder")) + // if (rasSub.Set.Count != 0 && rasSub.AttributeContext.AtCorpusPath.StartsWith("cacheHolder")) // System.Diagnostics.Debug.WriteLine("Bad"); // rasSub.Set.ForEach(ra => // { - // if (ra.AttCtx.AtCoprusPath.StartsWith("cacheHolder")) + // if (ra.AttCtx.AtCorpusPath.StartsWith("cacheHolder")) // System.Diagnostics.Debug.WriteLine("Bad"); // // the target for a resolved att can be a typeAttribute OR it can be another resolvedAttributeSet (meaning a group) @@ -781,127 +792,13 @@ public async Task CreateResolvedEntityAsync(string newEntNa // our goal now is to prune that tree to just have the stuff one may need // do this by keeping the leafs and all of the lineage nodes for the attributes that end up in the resolved entity // along with some special nodes that explain entity structure and inherit - - // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set - // (so base entity chains, entity attributes entity definitions) - HashSet nodesToSave = new HashSet(); - Func SaveStructureNodes = null; - SaveStructureNodes = (subItem) => + //System.Diagnostics.Debug.Write($"res ent {entName}"); + if (!attCtx.PruneToScope(allPrimaryCtx)) { - CdmAttributeContext ac = subItem as CdmAttributeContext; - if (ac == null || ac.Type == CdmAttributeContextType.GeneratedSet) - { - return true; - } - nodesToSave.Add(ac); - if (ac.Contents == null || ac.Contents.Count == 0) - { - return true; - } - // look at all children - foreach (var subSub in ac.Contents) - { - if (SaveStructureNodes(subSub) == false) - { - return false; - } - } - return true; - }; - if (SaveStructureNodes(attCtx) == false) + // TODO: log error return null; - - // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save - // also mark any parents of those as savers - - // helper that save the passed node and anything up the parent chain - Func SaveParentNodes = null; - SaveParentNodes = (currNode) => - { - if (nodesToSave.Contains(currNode)) - { - return true; - } - nodesToSave.Add(currNode); - // get the parent - if (currNode.Parent != null && currNode.Parent.ExplicitReference != null) - { - return SaveParentNodes(currNode.Parent.ExplicitReference as CdmAttributeContext); - } - return true; - }; - - // helper that saves the current node (and parents) plus anything in the lineage (with their parents) - Func SaveLineageNodes = null; - SaveLineageNodes = (currNode) => - { - if (SaveParentNodes(currNode) == false) - { - return false; - } - if (currNode.Lineage != null && currNode.Lineage.Count > 0) - { - foreach (var lin in currNode.Lineage) - { - if (lin.ExplicitReference != null) - { - if (SaveLineageNodes(lin.ExplicitReference as CdmAttributeContext) == false) - { - return false; - } - } - } - } - return true; - }; - - // so, do that ^^^ for every primary context found earlier - foreach (var primCtx in allPrimaryCtx) - { - if (SaveLineageNodes(primCtx) == false) - { - return null; - } } - // now the cleanup, we have a set of the nodes that should be saved - // run over the tree and re-build the contents collection with only the things to save - Func CleanSubGroup = null; - CleanSubGroup = (subItem) => - { - if (subItem.ObjectType == CdmObjectType.AttributeRef) - { - return true; // not empty - } - - CdmAttributeContext ac = subItem as CdmAttributeContext; - - if (nodesToSave.Contains(ac) == false) - { - return false; // don't even look at content, this all goes away - } - - if (ac.Contents != null && ac.Contents.Count > 0) - { - // need to clean up the content array without triggering the code that fixes in document or paths - var newContent = new List(); - foreach (var sub in ac.Contents) - { - // true means keep this as a child - if (CleanSubGroup(sub) == true) - { - newContent.Add(sub); - } - } - // clear the old content and replace - ac.Contents.AllItems.Clear(); - ac.Contents.AllItems.AddRange(newContent); - } - - return true; - }; - CleanSubGroup(attCtx); - // create an all-up ordering of attributes at the leaves of this tree based on insert order // sort the attributes in each context by their creation order and mix that with the other sub-contexts that have been sorted Func orderContents = null; diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmManifestDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmManifestDefinition.cs index a0aac69feb..71fa048df2 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmManifestDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmManifestDefinition.cs @@ -139,16 +139,16 @@ public override CdmObject Copy(ResolveOptions resOpt = null, CdmObject host = nu copy.Entities.Clear(); foreach (var ent in this.Entities) - copy.Entities.Add(ent); + copy.Entities.Add(ent.Copy(resOpt) as CdmEntityDeclarationDefinition); copy.Relationships.Clear(); foreach (var rel in this.Relationships) - copy.Relationships.Add(rel); + copy.Relationships.Add(rel.Copy(resOpt) as CdmE2ERelationship); copy.SubManifests.Clear(); foreach (var man in this.SubManifests) - copy.SubManifests.Add(man); + copy.SubManifests.Add(man.Copy(resOpt) as CdmManifestDeclarationDefinition); copy.ExhibitsTraits.Clear(); foreach (var et in this.ExhibitsTraits) - copy.ExhibitsTraits.Add(et); + copy.ExhibitsTraits.Add(et.Copy() as CdmTraitReferenceBase); return copy; } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectBase.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectBase.cs index bdcd71df15..54f7064dfb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectBase.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectBase.cs @@ -254,6 +254,21 @@ internal ResolvedAttributeSet FetchResolvedAttributes(ResolveOptions resOpt = nu { ctx.Corpus.RegisterDefinitionReferenceSymbols(oDef, kind, resOpt.SymbolRefSet); + if (this.ObjectType == CdmObjectType.EntityDef) + { + // if we just got attributes for an entity, take the time now to clean up this cached tree and prune out + // things that don't help explain where the final set of attributes came from + if (underCtx != null) + { + var scopesForAttributes = new HashSet(); + underCtx.CollectContextFromAtts(rasbCache.ResolvedAttributeSet, scopesForAttributes); // the context node for every final attribute + if (!underCtx.PruneToScope(scopesForAttributes)) + { + return null; + } + } + } + // get the new cache tag now that we have the list of docs string cacheTag = ctx.Corpus.CreateDefinitionCacheTag(resOpt, this, kind, acpInContext != null ? "ctx" : null); diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectReferenceBase.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectReferenceBase.cs index d012fcaefc..21fc842588 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectReferenceBase.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmObjectReferenceBase.cs @@ -286,16 +286,15 @@ public override T FetchObjectDefinition(ResolveOptions resOpt = null) resOpt = new ResolveOptions(this, this.Ctx.Corpus.DefaultResolutionDirectives); } - dynamic def = this.FetchResolvedReference(resOpt) as dynamic; - if (def != null) + CdmObject def = this.FetchResolvedReference(resOpt); + if (def != null && def is CdmObjectReferenceBase reference) { - if (def is CdmObjectReferenceBase) - { - def = def.FetchResolvedReference(resOpt) as dynamic; - } + def = reference.FetchResolvedReference(resOpt); } if (def != null && !(def is CdmObjectReference)) - return def; + { + return (T)def; + } return default(T); } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmReferencesEntities.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmReferencesEntities.cs index be5d029e9b..a65efd05f3 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmReferencesEntities.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmReferencesEntities.cs @@ -5,9 +5,11 @@ namespace Microsoft.CommonDataModel.ObjectModel.Cdm { using Microsoft.CommonDataModel.ObjectModel.ResolvedModel; using Microsoft.CommonDataModel.ObjectModel.Utilities; + using System; public interface CdmReferencesEntities { + [Obsolete("For internal use only.")] ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null); } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmTypeAttributeDefinition.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmTypeAttributeDefinition.cs index 7f6890accb..8d6209415f 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmTypeAttributeDefinition.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Cdm/CdmTypeAttributeDefinition.cs @@ -424,9 +424,14 @@ internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(Resolv // make a copy and add defaults if missing CdmAttributeResolutionGuidance resGuideWithDefault; if (this.ResolutionGuidance != null) + { + resOpt.UsedResolutionGuidance = true; resGuideWithDefault = (CdmAttributeResolutionGuidance)this.ResolutionGuidance.Copy(resOpt); + } else + { resGuideWithDefault = new CdmAttributeResolutionGuidance(this.Ctx); + } // renameFormat is not currently supported for type attributes resGuideWithDefault.renameFormat = null; @@ -444,6 +449,7 @@ internal override ResolvedAttributeSetBuilder ConstructResolvedAttributes(Resolv return rasb; } + [Obsolete("For internal use only.")] public override ResolvedEntityReferenceSet FetchResolvedEntityReferences(ResolveOptions resOpt = null) { return null; diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Enums/CdmLogCode.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Enums/CdmLogCode.cs index c8cb3a7a19..f607399cbb 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Enums/CdmLogCode.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Enums/CdmLogCode.cs @@ -115,6 +115,7 @@ public enum CdmLogCode ErrValdnMissingLanguageTag, ErrUnrecognizedType, WarnPartitionGlobAndRegexPresent, + WarnDeprecatedResolutionGuidance, WarnDocChangesDiscarded, WarnDocImportNotLoaded, WarnPartitionFileFetchFailed, diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.ALL.nuspec b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.ALL.nuspec index 9e9c7f7976..134cea12fd 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.ALL.nuspec +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.ALL.nuspec @@ -5,7 +5,7 @@ Microsoft.CommonDataModel.ObjectModel.All - 1.2.1 + 1.2.2 The CSharp implementation of the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.csproj b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.csproj index 6813daba3a..f724595f3e 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.csproj +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45;net462 - 1.2.1 + 1.2.2 The CSharp implementation of the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.nuspec b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.nuspec index e93ce6fb50..3720895f81 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.nuspec +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Microsoft.CommonDataModel.ObjectModel.nuspec @@ -5,7 +5,7 @@ Microsoft.CommonDataModel.ObjectModel - 1.2.1 + 1.2.2 The CSharp implementation of the Microsoft Common Data Model Object Model. Microsoft diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.Designer.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.Designer.cs index 9b3c8949f8..17bcd24a82 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.Designer.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.Designer.cs @@ -1041,6 +1041,15 @@ internal static string WarnAnnotationTypeNotSupported { } } + /// + /// Looks up a localized string similar to Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview.. + /// + internal static string WarnDeprecatedResolutionGuidance { + get { + return ResourceManager.GetString("WarnDeprecatedResolutionGuidance", resourceCulture); + } + } + /// /// Looks up a localized string similar to discarding changes in document: {0}. /// diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.resx b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.resx index 1bf9a50947..70c9bea533 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.resx +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Resx/LogMessages.resx @@ -453,6 +453,9 @@ The Data Partition Pattern contains both a glob pattern ({0}) and a regular expression ({1}) set, the glob pattern will be used. + + Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview. + Import document {0} not loaded. This may cause unexpected behavior of the model. diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/Logging/EventList.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/Logging/EventList.cs index b90984d578..ab6010107b 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/Logging/EventList.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/Logging/EventList.cs @@ -4,6 +4,7 @@ namespace Microsoft.CommonDataModel.ObjectModel.Utilities.Logging { using System.Collections.Generic; + using System.Threading; /// /// EventList is a supporting class for the logging system and allows subset of messages @@ -37,19 +38,43 @@ public class EventList : List> /// private int nestingLevel = 0; + /// + /// Lock to be used to enter and leave scope. + /// + private SpinLock spinLock; + + public EventList() : base() + { + spinLock = new SpinLock(false); + } + /// /// Clears the log recorder and enables recoding of log messages. /// internal void Enable() { - // If we are going into nested recorded functions, we should not clear previously recorded events - if (nestingLevel == 0) + bool lockTaken = false; + try { - Clear(); - IsRecording = true; - } + spinLock.Enter(ref lockTaken); - nestingLevel++; + // If we are going into nested recorded functions, we should not clear previously recorded events + if (nestingLevel == 0) + { + Clear(); + IsRecording = true; + } + + nestingLevel++; + } + finally + { + if (lockTaken) + { + spinLock.Exit(); + } + } + } /// @@ -57,11 +82,23 @@ internal void Enable() /// internal void Disable() { - nestingLevel--; + bool lockTaken = false; + try + { + spinLock.Enter(ref lockTaken); + nestingLevel--; - if (nestingLevel == 0) + if (nestingLevel == 0) + { + IsRecording = false; + } + } + finally { - IsRecording = false; + if (lockTaken) + { + spinLock.Exit(); + } } } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/ResolveOptions.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/ResolveOptions.cs index a314c9b3c5..15834574bc 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/ResolveOptions.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/ResolveOptions.cs @@ -27,6 +27,8 @@ public class ResolveOptions internal DepthInfo DepthInfo { get; set; } // Indicates whether we are resolving inside of a circular reference, resolution is different in that case internal bool InCircularReference { get; set; } + // Indicates if resolution guidance was used at any point during resolution + internal bool UsedResolutionGuidance { get; set; } internal ISet CurrentlyResolvingEntities { get; set; } @@ -118,11 +120,14 @@ internal ResolveOptions Copy() MapOldCtxToNewCtx = this.MapOldCtxToNewCtx, // ok to share this map ImportsLoadStrategy = this.ImportsLoadStrategy, SaveResolutionsOnCopy = this.SaveResolutionsOnCopy, - CurrentlyResolvingEntities = new HashSet(this.CurrentlyResolvingEntities) + CurrentlyResolvingEntities = new HashSet(this.CurrentlyResolvingEntities), + UsedResolutionGuidance = this.UsedResolutionGuidance }; if (this.Directives != null) + { resOptCopy.Directives = this.Directives.Copy(); + } return resOptCopy; } diff --git a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/TraitToPropertyMap.cs b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/TraitToPropertyMap.cs index a8914b9b23..ef6573eeae 100644 --- a/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/TraitToPropertyMap.cs +++ b/objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel/Utilities/TraitToPropertyMap.cs @@ -619,7 +619,7 @@ internal dynamic FetchDefaultValue(bool onlyFromProperty) return defVal; if ((defVal as CdmObject).ObjectType == CdmObjectType.EntityRef) { - var cEnt = (defVal as CdmObject).FetchObjectDefinition(null) as CdmConstantEntityDefinition; + var cEnt = (defVal as CdmObject).FetchObjectDefinition() as CdmConstantEntityDefinition; if (cEnt != null) { string esName = cEnt.EntityShape.FetchObjectDefinitionName(); diff --git a/objectModel/Java/objectmodel/resx/LogMessages.properties b/objectModel/Java/objectmodel/resx/LogMessages.properties index 100daf57bf..510d6363bc 100644 --- a/objectModel/Java/objectmodel/resx/LogMessages.properties +++ b/objectModel/Java/objectmodel/resx/LogMessages.properties @@ -108,6 +108,7 @@ ErrValdnInvalidResx=The {0} '{1}' could not form a valid regular expression. Rea ErrValdnMissingDoc=Document '{0}' is not in a folder ErrValdnMissingLanguageTag=Default value missing languageTag or displayText. WarnPartitionGlobAndRegexPresent=The Data Partition Pattern contains both a glob pattern ({0}) and a regular expression ({1}) set, the glob pattern will be used. +WarnDeprecatedResolutionGuidance=Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview. WarnDocChangesDiscarded=discarding changes in document: {0} WarnDocImportNotLoaded=Import document {0} not loaded. This may cause unexpected behavior of the model. WarnPartitionFileFetchFailed=Failed to fetch all files in the folder location '{0}' described by a partition pattern. Exception: {1} diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttribute.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttribute.java index a547b0125c..322e8a0527 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttribute.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttribute.java @@ -64,10 +64,18 @@ public void setPurpose(final CdmPurposeReference value) { this.purpose = value; } + /** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public CdmAttributeResolutionGuidance getResolutionGuidance() { return this.resolutionGuidance; } + /** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public void setResolutionGuidance(final CdmAttributeResolutionGuidance value) { this.resolutionGuidance = value; } diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeContext.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeContext.java index d22f7ef48e..c843fe27c8 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeContext.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeContext.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.Set; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -723,6 +724,195 @@ private void fixAndFinalizeAttCtxNodeLineage(final CdmObject subItem) { } } + /** + * @deprecated + */ + void collectContextFromAtts(ResolvedAttributeSet rasSub, HashSet collected) { + rasSub.getSet().forEach(ra -> { + CdmAttributeContext raCtx = ra.getAttCtx(); + CdmCollection refs = raCtx.getContents(); + collected.add(raCtx); + + // the target for a resolved att can be a TypeAttribute OR it can be another ResolvedAttributeSet (meaning a group) + if (ra.getTarget() instanceof ResolvedAttributeSet) { + // a group + collectContextFromAtts((ResolvedAttributeSet) ra.getTarget(), collected); + } + }); + } + + /** + * Helper that save the passed node and anything up the parent chain + */ + private boolean saveParentNodes(CdmAttributeContext currNode, HashSet nodesToSave) { + if (nodesToSave.contains(currNode)) { + return true; + } + nodesToSave.add(currNode); + // get the parent + if (currNode.getParent() != null && currNode.getParent().getExplicitReference() != null) { + return saveParentNodes((CdmAttributeContext) currNode.getParent().getExplicitReference(), nodesToSave); + } + return true; + }; + + /** + * Helper that saves the current node (and parents) plus anything in the lineage (with their parents) + */ + private boolean saveLineageNodes(CdmAttributeContext currNode, HashSet nodesToSave) { + if (!saveParentNodes(currNode, nodesToSave)) { + return false; + } + if (currNode.getLineage() != null && currNode.getLineage().getCount() > 0) { + for (CdmAttributeContextReference lin : currNode.getLineage()) { + if (lin.getExplicitReference() != null) { + if (!saveLineageNodes((CdmAttributeContext) lin.getExplicitReference(), nodesToSave)) { + return false; + } + } + } + } + return true; + }; + + private boolean saveStructureNodes(CdmObject subItem, boolean inGenerated, boolean inProjection, boolean inRemove, HashSet nodesToSave) { + if (!(subItem instanceof CdmAttributeContext)) { + return true; + } + + CdmAttributeContext ac = (CdmAttributeContext) subItem; + if (ac.getType() == CdmAttributeContextType.GeneratedSet) { + inGenerated = true; // special mode where we hate everything except the removed att notes + } + + if (inGenerated && (ac.getType() == CdmAttributeContextType.OperationExcludeAttributes || ac.getType() == CdmAttributeContextType.OperationIncludeAttributes)) { + inRemove = true; // triggers us to know what to do in the next code block. + } + boolean removedAttribute = false; + if (ac.getType() == CdmAttributeContextType.AttributeDefinition) { + // empty attribute nodes are descriptions of source attributes that may or may not be needed. lineage will sort it out. + // the exception is for attribute descriptions under a remove attributes operation. they are gone from the resolved att set, so + // no history would remain + if (inRemove) { + removedAttribute = true; + } else if (ac.getContents() == null || ac.getContents().getCount() == 0) { + return true; + } + } + + if (!inGenerated || removedAttribute) { + // mark this as something worth saving, sometimes + // these get discovered at the leaf of a tree that we want to mostly ignore, so can cause a + // discontinuity in the 'save' chains, so fix that + saveLineageNodes(ac, nodesToSave); + } + + if (ac.getType() == CdmAttributeContextType.Projection) { + inProjection = true; // track this so we can do the next thing ... + } + if (ac.getType() == CdmAttributeContextType.Entity && inProjection) { + // this is far enough, the entity that is somewhere under a projection chain + // things under this might get saved through lineage, but down to this point will get in for sure + return true; + } + + if (ac.getContents() == null || ac.getContents().getCount() == 0) { + return true; + } + // look at all children + for (CdmObject subSub : ac.getContents()) { + if (!saveStructureNodes(subSub, inGenerated, inProjection, inRemove, nodesToSave)) { + return false; + } + } + return true; + }; + + private boolean cleanSubGroup(CdmObject subItem, HashSet nodesToSave) { + if (subItem.getObjectType() == CdmObjectType.AttributeRef) { + return true; // not empty + } + + CdmAttributeContext ac = (CdmAttributeContext) subItem; + + if (!nodesToSave.contains(ac)) { + return false; // don't even look at content, this all goes away + } + + if (ac.getContents() != null && ac.getContents().getCount() > 0) { + // need to clean up the content array without triggering the code that fixes in document or paths + ArrayList newContent = new ArrayList(); + for (CdmObject sub : ac.getContents()) { + // true means keep this as a child + if (cleanSubGroup(sub, nodesToSave)) { + newContent.add(sub); + } + } + // clear the old content and replace + ac.getContents().clear(); + ac.getContents().addAll(newContent); + } + + return true; + }; + + boolean pruneToScope(Set scopeSet) { + // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set + // (so base entity chains, entity attributes entity definitions) + + // for testing, don't delete this + //Func CountNodes = null; + //CountNodes = (subItem) => + //{ + // CdmAttributeContext ac = subItem as CdmAttributeContext; + // if (ac == null) + // { + // return 1; + // } + // if (ac.Contents == null || ac.Contents.Count == 0) + // { + // return 1; + // } + // // look at all children + // long total = 0; + // foreach (var subSub in ac.Contents) + // { + // total += CountNodes(subSub); + // } + // return 1 + total; + //}; + //System.Diagnostics.Debug.WriteLine($"Pre Prune {CountNodes(this)}"); + + + // so ... the change from the old behavior is to depend on the lineage pointers to save the attribute defs + // in the 'structure' part of the tree that might matter. keep all of the other structure info and keep some + // special nodes (like the ones that have removed attributes) that won't get found from lineage trace but that are + // needed to understand what took place in resolution + HashSet nodesToSave = new HashSet(); + + if (!saveStructureNodes(this, false, false, false, nodesToSave)) { + return false; + } + + // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save + // also mark any parents of those as savers + + // so, do that ^^^ for every primary context found earlier + for (CdmAttributeContext primCtx : scopeSet) { + if (!saveLineageNodes(primCtx, nodesToSave)) { + return false; + } + } + + // now the cleanup, we have a set of the nodes that should be saved + // run over the tree and re-build the contents collection with only the things to save + cleanSubGroup(this, nodesToSave); + + //System.Diagnostics.Debug.WriteLine($"Post Prune {CountNodes(this)}"); + + return true; + } + @Deprecated public Boolean validateLineage(ResolveOptions resOpt) { diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupDefinition.java index cf0bd1103e..d8c1e5dc1d 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupDefinition.java @@ -148,7 +148,8 @@ public CdmCollection getMembers() { } - /** + /** + * @deprecated for internal use only. * @param resOpt Resolved options * @return ResolvedEntityReferenceSet */ diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupReference.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupReference.java index ecbed98030..d1c2049621 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupReference.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeGroupReference.java @@ -87,7 +87,8 @@ public Object copyData(final ResolveOptions resOpt, final CopyOptions options) { } - /** + /** + * * @deprecated for internal use only. * @param resOpt Resolved options * @return ResolvedEntityReferenceSet */ diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeResolutionGuidance.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeResolutionGuidance.java index dd17dc796a..436f41b3d0 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeResolutionGuidance.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmAttributeResolutionGuidance.java @@ -10,6 +10,10 @@ import java.util.ArrayList; import java.util.List; +/** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public class CdmAttributeResolutionGuidance extends CdmObjectSimple { private Boolean removeAttribute; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmCorpusDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmCorpusDefinition.java index 3b48b24aeb..4922e0db21 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmCorpusDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmCorpusDefinition.java @@ -319,9 +319,20 @@ String createDefinitionCacheTag(final ResolveOptions resOpt, final CdmObjectBase tagSuffix.append(String.format("-%s-%s", kind, thisId)); tagSuffix.append(String .format("-(%s)", resOpt.getDirectives() != null ? resOpt.getDirectives().getTag() : "")); - if (resOpt.depthInfo.getMaxDepthExceeded()) { - DepthInfo currDepthInfo = resOpt.depthInfo; - tagSuffix.append(String.format("-%s", currDepthInfo.getMaxDepth() - currDepthInfo.getCurrentDepth())); + // only for attributes + if (kind == "rasb") { + // if MaxDepth was not initialized before, initialize it now + if (resOpt.depthInfo.getMaxDepth() == null) { + resOpt.depthInfo.setMaxDepth(resOpt.getMaxDepth()); + } + + // add to the cache tag either if we reached maximum depth or how many levels we can go down until reaching the maximum depth + if (resOpt.depthInfo.getCurrentDepth() > resOpt.depthInfo.getMaxDepth()) { + tagSuffix.append("-overMaxDepth"); + } else { + DepthInfo currDepthInfo = resOpt.depthInfo; + tagSuffix.append(String.format("-%stoMaxDepth", currDepthInfo.getMaxDepth() - currDepthInfo.getCurrentDepth())); + } } if (resOpt.inCircularReference) { tagSuffix.append("-pk"); @@ -758,9 +769,12 @@ public CdmObjectBase resolveSymbolReference( } CdmDocumentDefinition wrtDoc = resOpt.getWrtDoc(); - if (!wrtDoc.indexIfNeededAsync(resOpt, true).join()) { - Logger.error(ctx, TAG, "resolveSymbolReference", wrtDoc.getAtCorpusPath(), CdmLogCode.ErrIndexFailed); - return null; + + if (wrtDoc.getNeedsIndexing() && !wrtDoc.isCurrentlyIndexing()) { + if (!wrtDoc.indexIfNeededAsync(resOpt, true).join()) { + Logger.error(ctx, TAG, "resolveSymbolReference", wrtDoc.getAtCorpusPath(), CdmLogCode.ErrIndexFailed); + return null; + } } if (wrtDoc.getNeedsIndexing() && resOpt.getImportsLoadStrategy() == ImportsLoadStrategy.DoNotLoad) { diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityAttributeDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityAttributeDefinition.java index 2ef60bfb1e..517486ce27 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityAttributeDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityAttributeDefinition.java @@ -145,6 +145,9 @@ public void setIsPolymorphicSource(final Boolean polymorphicSource) { isPolymorphicSource = polymorphicSource; } + /** + * @deprecated for internal use only. + */ @Override public ResolvedEntityReferenceSet fetchResolvedEntityReferences(ResolveOptions resOpt) { if (resOpt == null) { @@ -373,9 +376,13 @@ public ResolvedAttributeSetBuilder constructResolvedAttributes( ProjectionDirective projDirective = new ProjectionDirective(resOpt, this, this.getEntity()); ProjectionContext projCtx = projDef.constructProjectionContext(projDirective, under); rasb.setResolvedAttributeSet(projDef.extractResolvedAttributes(projCtx, under)); + // from the traits of purpose and applied here + rasb.getResolvedAttributeSet().applyTraits(this.fetchResolvedTraits(resOpt)); } } else { - // An Entity Reference + // Resolution guidance + + resOpt.usedResolutionGuidance = true; AttributeResolutionContext arc = this.fetchAttResContext(resOpt); final RelationshipInfo relInfo = arc.getRelationshipInfo(); diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityDefinition.java index 96ba6cb7a2..2bed497ff7 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmEntityDefinition.java @@ -97,10 +97,18 @@ public void setExtendsEntity(final CdmEntityReference extendsEntity) { this.extendsEntity = extendsEntity; } + /** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public CdmAttributeResolutionGuidance getExtendsEntityResolutionGuidance() { return extendsEntityResolutionGuidance; } + /** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public void setExtendsEntityResolutionGuidance(CdmAttributeResolutionGuidance extendsEntityResolutionGuidance) { this.extendsEntityResolutionGuidance = extendsEntityResolutionGuidance; } @@ -291,6 +299,8 @@ public ResolvedAttributeSetBuilder constructResolvedAttributes(final ResolveOpti } if (this.getExtendsEntityResolutionGuidance() != null) { + resOpt.usedResolutionGuidance = true; + // some guidance was given on how to integrate the base attributes into the set. apply that guidance ResolvedTraitSet rtsBase = this.fetchResolvedTraits(resOpt); @@ -390,158 +400,162 @@ public CompletableFuture createResolvedEntityAsync( ResolveOptions resOpt, CdmFolderDefinition folderDef, final String newDocName) { - try (Logger.LoggerScope logScope = Logger.enterScope(CdmEntityDefinition.class.getSimpleName(), getCtx(), "createResolvedEntityAsync")) { - if (resOpt == null) { - resOpt = new ResolveOptions(this, this.getCtx().getCorpus().getDefaultResolutionDirectives()); - } + Logger.LoggerScope logScope = Logger.enterScope(TAG, getCtx(), "createResolvedEntityAsync"); + if (resOpt == null) { + resOpt = new ResolveOptions(this, this.getCtx().getCorpus().getDefaultResolutionDirectives()); + } - if (resOpt.getWrtDoc() == null) { - Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrDocWrtDocNotfound); - return CompletableFuture.completedFuture(null); - } + if (resOpt.getWrtDoc() == null) { + Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrDocWrtDocNotfound); + return CompletableFuture.completedFuture(null); + } - if (StringUtils.isNullOrEmpty(newEntName)) { - Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrResolveEntityNotFound); - return CompletableFuture.completedFuture(null); - } + if (StringUtils.isNullOrEmpty(newEntName)) { + Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrResolveEntityNotFound); + return CompletableFuture.completedFuture(null); + } - final ResolveOptions finalResOpt = resOpt; - final CdmFolderDefinition folder = folderDef != null ? folderDef : this.getInDocument().getFolder(); + final ResolveOptions finalResOpt = resOpt; + final CdmFolderDefinition folder = folderDef != null ? folderDef : this.getInDocument().getFolder(); - return CompletableFuture.supplyAsync(() -> { - // if the wrtDoc needs to be indexed (like it was just modified) then do that first - if (!finalResOpt.getWrtDoc().indexIfNeededAsync(finalResOpt, true).join()) { - Logger.error(this.getCtx(), TAG,"createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrIndexFailed); - return null; - } + return CompletableFuture.supplyAsync(() -> { + // if the wrtDoc needs to be indexed (like it was just modified) then do that first + if (!finalResOpt.getWrtDoc().indexIfNeededAsync(finalResOpt, true).join()) { + Logger.error(this.getCtx(), TAG,"createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrIndexFailed); + return null; + } - final String fileName = (StringUtils.isNullOrEmpty(newDocName)) ? String.format("%s.cdm.json", newEntName) : newDocName; - String origDoc = this.getInDocument().getAtCorpusPath(); - // Don't overwrite the source document - final String targetAtCorpusPath = String.format("%s%s", - this.getCtx() - .getCorpus() - .getStorage() - .createAbsoluteCorpusPath(folder.getAtCorpusPath(), folder), - fileName); - if (StringUtils.equalsWithIgnoreCase(targetAtCorpusPath, origDoc)) { - Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrDocEntityReplacementFailure, targetAtCorpusPath); - return null; - } + final String fileName = (StringUtils.isNullOrEmpty(newDocName)) ? String.format("%s.cdm.json", newEntName) : newDocName; + String origDoc = this.getInDocument().getAtCorpusPath(); + // Don't overwrite the source document + final String targetAtCorpusPath = String.format("%s%s", + this.getCtx() + .getCorpus() + .getStorage() + .createAbsoluteCorpusPath(folder.getAtCorpusPath(), folder), + fileName); + if (StringUtils.equalsWithIgnoreCase(targetAtCorpusPath, origDoc)) { + Logger.error(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.ErrDocEntityReplacementFailure, targetAtCorpusPath); + return null; + } - // make sure the corpus has a set of default artifact attributes - this.getCtx().getCorpus().prepareArtifactAttributesAsync().join(); - - // Make the top level attribute context for this entity. - // For this whole section where we generate the attribute context tree and get resolved attributes. - // Set the flag that keeps all of the parent changes and document dirty from from happening. - boolean wasResolving = this.getCtx().getCorpus().isCurrentlyResolving; - this.getCtx().getCorpus().isCurrentlyResolving = true; - final String entName = newEntName; - final ResolveContext ctx = (ResolveContext) this.getCtx(); - CdmAttributeContext attCtxEnt = ctx.getCorpus().makeObject(CdmObjectType.AttributeContextDef, entName, true); - attCtxEnt.setCtx(ctx); - attCtxEnt.setInDocument(this.getInDocument()); - - // cheating a bit to put the paths in the right place - final AttributeContextParameters acp = new AttributeContextParameters(); - acp.setUnder(attCtxEnt); - acp.setType(CdmAttributeContextType.AttributeGroup); - acp.setName("attributeContext"); - - final CdmAttributeContext attCtxAC = CdmAttributeContext.createChildUnder(finalResOpt, acp); - // this is the node that actually is first in the context we save. all definition refs should take the new perspective that they - // can only be understood through the resolvedFrom moniker - final CdmEntityReference entRefThis = ctx.getCorpus().makeObject(CdmObjectType.EntityRef, this.getName(), true); - entRefThis.setOwner(this); - entRefThis.setInDocument(this.getInDocument()); // need to set owner and inDocument to this starting entity so the ref will be portable to the new document - CdmObject prevOwner = this.getOwner(); - entRefThis.setExplicitReference(this); - // we don't want to change the owner of this entity to the entity reference - // re-assign whatever was there before - this.setOwner(prevOwner); - - final AttributeContextParameters acpEnt = new AttributeContextParameters(); - acpEnt.setUnder(attCtxAC); - acpEnt.setType(CdmAttributeContextType.Entity); - acpEnt.setName(entName); - acpEnt.setRegarding(entRefThis); - - // reset previous depth information in case there are left overs - finalResOpt.depthInfo.reset(); - - final ResolveOptions resOptCopy = CdmAttributeContext.prepareOptionsForResolveAttributes(finalResOpt); - // resolve attributes with this context. the end result is that each resolved attribute - // points to the level of the context where it was last modified, merged, created - final ResolvedAttributeSet ras = this.fetchResolvedAttributes(resOptCopy, acpEnt); - - if (ras == null) { - return null; - } + // make sure the corpus has a set of default artifact attributes + this.getCtx().getCorpus().prepareArtifactAttributesAsync().join(); + + // Make the top level attribute context for this entity. + // For this whole section where we generate the attribute context tree and get resolved attributes. + // Set the flag that keeps all of the parent changes and document dirty from from happening. + boolean wasResolving = this.getCtx().getCorpus().isCurrentlyResolving; + this.getCtx().getCorpus().isCurrentlyResolving = true; + final String entName = newEntName; + final ResolveContext ctx = (ResolveContext) this.getCtx(); + CdmAttributeContext attCtxEnt = ctx.getCorpus().makeObject(CdmObjectType.AttributeContextDef, entName, true); + attCtxEnt.setCtx(ctx); + attCtxEnt.setInDocument(this.getInDocument()); + + // cheating a bit to put the paths in the right place + final AttributeContextParameters acp = new AttributeContextParameters(); + acp.setUnder(attCtxEnt); + acp.setType(CdmAttributeContextType.AttributeGroup); + acp.setName("attributeContext"); + + final CdmAttributeContext attCtxAC = CdmAttributeContext.createChildUnder(finalResOpt, acp); + // this is the node that actually is first in the context we save. all definition refs should take the new perspective that they + // can only be understood through the resolvedFrom moniker + final CdmEntityReference entRefThis = ctx.getCorpus().makeObject(CdmObjectType.EntityRef, this.getName(), true); + entRefThis.setOwner(this); + entRefThis.setInDocument(this.getInDocument()); // need to set owner and inDocument to this starting entity so the ref will be portable to the new document + CdmObject prevOwner = this.getOwner(); + entRefThis.setExplicitReference(this); + // we don't want to change the owner of this entity to the entity reference + // re-assign whatever was there before + this.setOwner(prevOwner); + + final AttributeContextParameters acpEnt = new AttributeContextParameters(); + acpEnt.setUnder(attCtxAC); + acpEnt.setType(CdmAttributeContextType.Entity); + acpEnt.setName(entName); + acpEnt.setRegarding(entRefThis); + + // reset previous depth information in case there are left overs + finalResOpt.depthInfo.reset(); + + final ResolveOptions resOptCopy = CdmAttributeContext.prepareOptionsForResolveAttributes(finalResOpt); + // resolve attributes with this context. the end result is that each resolved attribute + // points to the level of the context where it was last modified, merged, created + final ResolvedAttributeSet ras = this.fetchResolvedAttributes(resOptCopy, acpEnt); + + if (resOptCopy.usedResolutionGuidance) { + Logger.warning(this.getCtx(), TAG, "createResolvedEntityAsync", this.getAtCorpusPath(), CdmLogCode.WarnDeprecatedResolutionGuidance); + } - this.getCtx().getCorpus().isCurrentlyResolving = wasResolving; + if (ras == null) { + return null; + } - // Make a new document in given folder if provided or the same folder as the source entity. - folder.getDocuments().remove(fileName); - CdmDocumentDefinition docRes = folder.getDocuments().add(fileName); - // Add a import of the source document. - origDoc = this.getCtx().getCorpus().getStorage().createRelativeCorpusPath(origDoc, docRes); // just in case we missed the prefix - docRes.getImports().add(origDoc, "resolvedFrom"); - docRes.setDocumentVersion(this.getInDocument().getDocumentVersion()); + this.getCtx().getCorpus().isCurrentlyResolving = wasResolving; - // Make the empty entity. - CdmEntityDefinition entResolved = docRes.getDefinitions().add(entName); + // Make a new document in given folder if provided or the same folder as the source entity. + folder.getDocuments().remove(fileName); + CdmDocumentDefinition docRes = folder.getDocuments().add(fileName); + // Add a import of the source document. + origDoc = this.getCtx().getCorpus().getStorage().createRelativeCorpusPath(origDoc, docRes); // just in case we missed the prefix + docRes.getImports().add(origDoc, "resolvedFrom"); + docRes.setDocumentVersion(this.getInDocument().getDocumentVersion()); - // grab that context that comes from fetchResolvedAttributes. We are sure this tree is a copy that we can own, so no need to copy it again - CdmAttributeContext attCtx = null; - if (attCtxAC != null && attCtxAC.getContents() != null && attCtxAC.getContents().size() == 1) { - attCtx = (CdmAttributeContext) attCtxAC.getContents().get(0); - } - entResolved.setAttributeContext(attCtx); - - if (attCtx != null) { - // fix all of the definition references, parent and lineage references, owner documents, etc. in the context tree - attCtx.finalizeAttributeContext(resOptCopy, String.format("%s/attributeContext/", entName), docRes, this.getInDocument(), "resolvedFrom", true); - - // TEST CODE in C# by Jeff - // run over the resolved attributes and make sure none have the dummy context - //Action testResolveAttributeCtx = null; - //testResolveAttributeCtx = (rasSub) => - //{ - // if (rasSub.Set.Count != 0 && rasSub.AttributeContext.AtCoprusPath.StartsWith("cacheHolder")) - // System.Diagnostics.Debug.WriteLine("Bad!!"); - // rasSub.Set.ForEach(ra => - // { - // if (ra.AttCtx.AtCoprusPath.StartsWith("cacheHolder")) - // System.Diagnostics.Debug.WriteLine("Bad!!"); - - // // the target for a resolved att can be a typeAttribute OR it can be another resolvedAttributeSet (meaning a group) - // if (ra.Target is ResolvedAttributeSet) - // { - // testResolveAttributeCtx(ra.Target as ResolvedAttributeSet); - // } - // }); - //}; - //testResolveAttributeCtx(ras); + // Make the empty entity. + CdmEntityDefinition entResolved = docRes.getDefinitions().add(entName); + // grab that context that comes from fetchResolvedAttributes. We are sure this tree is a copy that we can own, so no need to copy it again + CdmAttributeContext attCtx = null; + if (attCtxAC != null && attCtxAC.getContents() != null && attCtxAC.getContents().size() == 1) { + attCtx = (CdmAttributeContext) attCtxAC.getContents().get(0); + } + entResolved.setAttributeContext(attCtx); + + if (attCtx != null) { + // fix all of the definition references, parent and lineage references, owner documents, etc. in the context tree + attCtx.finalizeAttributeContext(resOptCopy, String.format("%s/attributeContext/", entName), docRes, this.getInDocument(), "resolvedFrom", true); + + // TEST CODE in C# by Jeff + // run over the resolved attributes and make sure none have the dummy context + //Action testResolveAttributeCtx = null; + //testResolveAttributeCtx = (rasSub) => + //{ + // if (rasSub.Set.Count != 0 && rasSub.AttributeContext.AtCoprusPath.StartsWith("cacheHolder")) + // System.Diagnostics.Debug.WriteLine("Bad!!"); + // rasSub.Set.ForEach(ra => + // { + // if (ra.AttCtx.AtCoprusPath.StartsWith("cacheHolder")) + // System.Diagnostics.Debug.WriteLine("Bad!!"); + + // // the target for a resolved att can be a typeAttribute OR it can be another resolvedAttributeSet (meaning a group) + // if (ra.Target is ResolvedAttributeSet) + // { + // testResolveAttributeCtx(ra.Target as ResolvedAttributeSet); + // } + // }); + //}; + //testResolveAttributeCtx(ras); + + } + // Add the traits of the entity, also add to attribute context top node + ResolvedTraitSet rtsEnt = this.fetchResolvedTraits(finalResOpt); + for (final ResolvedTrait rt : rtsEnt.getSet()) { + CdmTraitReference traitRef = CdmObjectBase.resolvedTraitToTraitRef(resOptCopy, rt); + entResolved.getExhibitsTraits().add(traitRef); + traitRef = CdmObjectBase.resolvedTraitToTraitRef(resOptCopy, rt); // fresh copy + if (entResolved.getAttributeContext() != null) { + entResolved.getAttributeContext().getExhibitsTraits().add(traitRef); } - // Add the traits of the entity, also add to attribute context top node - ResolvedTraitSet rtsEnt = this.fetchResolvedTraits(finalResOpt); - for (final ResolvedTrait rt : rtsEnt.getSet()) { - CdmTraitReference traitRef = CdmObjectBase.resolvedTraitToTraitRef(resOptCopy, rt); - entResolved.getExhibitsTraits().add(traitRef); - traitRef = CdmObjectBase.resolvedTraitToTraitRef(resOptCopy, rt); // fresh copy - if (entResolved.getAttributeContext() != null) { - entResolved.getAttributeContext().getExhibitsTraits().add(traitRef); - } - } + } - // special trait to explain this is a resolved entity - entResolved.indicateAbstractionLevel("resolved", finalResOpt); + // special trait to explain this is a resolved entity + entResolved.indicateAbstractionLevel("resolved", finalResOpt); - if (entResolved.getAttributeContext() != null) { - // the attributes have been named, shaped, etc for this entity so now it is safe to go and - // make each attribute context level point at these final versions of attributes + if (entResolved.getAttributeContext() != null) { + // the attributes have been named, shaped, etc for this entity so now it is safe to go and + // make each attribute context level point at these final versions of attributes // what we have is a resolved attribute set (maybe with structure) where each ra points at the best tree node // we also have the tree of context, we need to flip this around so that the right tree nodes point at the paths to the @@ -554,93 +568,76 @@ public CompletableFuture createResolvedEntityAsync( // our goal now is to prune that tree to just have the stuff one may need // do this by keeping the leafs and all of the lineage nodes for the attributes that end up in the resolved entity // along with some special nodes that explain entity structure and inherit - - // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set - // (so base entity chains, entity attributes entity definitions) - HashSet nodesToSave = new LinkedHashSet<>(); - if (!saveStructureNodes(attCtx, nodesToSave)) { + if (!attCtx.pruneToScope(allPrimaryCtx)) { + // TODO: log error. return null; } - // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save - // also mark any parents of those as savers - - // so, do that ^^^ for every primary context found earlier - for (final CdmAttributeContext primCtx : allPrimaryCtx) { - if (!SaveLineageNodes(primCtx, nodesToSave)) { - return null; - } - } - - // now the cleanup, we have a set of the nodes that should be saved - // run over the tree and re-build the contents collection with only the things to save - cleanSubGroup(attCtx, nodesToSave); - // create an all-up ordering of attributes at the leaves of this tree based on insert order // sort the attributes in each context by their creation order and mix that with the other sub-contexts that have been sorted orderContents(attCtx, attPath2Order); - // resolved attributes can gain traits that are applied to an entity when referenced - // since these traits are described in the context, it is redundant and messy to list them in the attribute - // so, remove them. create and cache a set of names to look for per context - // there is actually a hierarchy to all attributes from the base entity should have all traits applied independently of the - // sub-context they come from. Same is true of attribute entities. so do this recursively top down - final HashMap> ctx2traitNames = new LinkedHashMap<>(); + // resolved attributes can gain traits that are applied to an entity when referenced + // since these traits are described in the context, it is redundant and messy to list them in the attribute + // so, remove them. create and cache a set of names to look for per context + // there is actually a hierarchy to all attributes from the base entity should have all traits applied independently of the + // sub-context they come from. Same is true of attribute entities. so do this recursively top down + final HashMap> ctx2traitNames = new LinkedHashMap<>(); - collectContextTraits(attCtx, new LinkedHashSet<>(), ctx2traitNames); + collectContextTraits(attCtx, new LinkedHashSet<>(), ctx2traitNames); - // add the attributes, put them in attribute groups if structure needed - final Map resAtt2RefPath = new LinkedHashMap<>(); + // add the attributes, put them in attribute groups if structure needed + final Map resAtt2RefPath = new LinkedHashMap<>(); - addAttributes(ras, entResolved, entName + "/hasAttributes/", docRes, - ctx2traitNames, resOptCopy, resAtt2RefPath); + addAttributes(ras, entResolved, entName + "/hasAttributes/", docRes, + ctx2traitNames, resOptCopy, resAtt2RefPath); - // fix entity traits - if (entResolved.getExhibitsTraits() != null) { - for (final CdmTraitReferenceBase et : entResolved.getExhibitsTraits()) { - if (et instanceof CdmTraitReference) { - replaceTraitAttRef((CdmTraitReference) et, newEntName, false); - } + // fix entity traits + if (entResolved.getExhibitsTraits() != null) { + for (final CdmTraitReferenceBase et : entResolved.getExhibitsTraits()) { + if (et instanceof CdmTraitReference) { + replaceTraitAttRef((CdmTraitReference) et, newEntName, false); } } - - fixContextTraits(attCtx, newEntName); - // and the attribute traits - final CdmCollection entAttributes = entResolved.getAttributes(); - if (entAttributes != null) { - entAttributes.forEach(entAtt -> { - final CdmTraitCollection attTraits = entAtt.getAppliedTraits(); - if (attTraits != null) { - attTraits.forEach(tr -> { - if (tr instanceof CdmTraitReference) { - replaceTraitAttRef((CdmTraitReference) tr, newEntName, false); - } - }); - } - }); - } } - // we are about to put this content created in the context of various documents (like references to attributes from base entities, etc.) - // into one specific document. all of the borrowed refs need to work. so, re-write all string references to work from this new document - // the catch-22 is that the new document needs these fixes done before it can be used to make these fixes. - // the fix needs to happen in the middle of the refresh - // trigger the document to refresh current content into the resolved OM - if (attCtx != null) { - attCtx.setParent(null); // remove the fake parent that made the paths work + fixContextTraits(attCtx, newEntName); + // and the attribute traits + final CdmCollection entAttributes = entResolved.getAttributes(); + if (entAttributes != null) { + entAttributes.forEach(entAtt -> { + final CdmTraitCollection attTraits = entAtt.getAppliedTraits(); + if (attTraits != null) { + attTraits.forEach(tr -> { + if (tr instanceof CdmTraitReference) { + replaceTraitAttRef((CdmTraitReference) tr, newEntName, false); + } + }); + } + }); } - final ResolveOptions resOptNew = finalResOpt.copy(); - resOptNew.setLocalizeReferencesFor(docRes); - resOptNew.setWrtDoc(docRes); - docRes.refreshAsync(resOptNew).join(); - // get a fresh ref - entResolved = (CdmEntityDefinition) docRes.fetchObjectFromDocumentPath(newEntName, resOptNew); + } - this.getCtx().getCorpus().resEntMap.put(this.getAtCorpusPath(), entResolved.getAtCorpusPath()); + // we are about to put this content created in the context of various documents (like references to attributes from base entities, etc.) + // into one specific document. all of the borrowed refs need to work. so, re-write all string references to work from this new document + // the catch-22 is that the new document needs these fixes done before it can be used to make these fixes. + // the fix needs to happen in the middle of the refresh + // trigger the document to refresh current content into the resolved OM + if (attCtx != null) { + attCtx.setParent(null); // remove the fake parent that made the paths work + } + final ResolveOptions resOptNew = finalResOpt.copy(); + resOptNew.setLocalizeReferencesFor(docRes); + resOptNew.setWrtDoc(docRes); + docRes.refreshAsync(resOptNew).join(); + // get a fresh ref + entResolved = (CdmEntityDefinition) docRes.fetchObjectFromDocumentPath(newEntName, resOptNew); - return entResolved; - }); - } + this.getCtx().getCorpus().resEntMap.put(this.getAtCorpusPath(), entResolved.getAtCorpusPath()); + + logScope.close(); + return entResolved; + }); } private void pointContextAtResolvedAtts(final ResolvedAttributeSet rasSub, final String @@ -677,55 +674,6 @@ private void pointContextAtResolvedAtts(final ResolvedAttributeSet rasSub, final }); } - private boolean saveStructureNodes(final CdmObject subItem, HashSet nodesToSave) { - if (!(subItem instanceof CdmAttributeContext) || ((CdmAttributeContext)subItem).getType() == CdmAttributeContextType.GeneratedSet) { - return true; - } - CdmAttributeContext ac = (CdmAttributeContext)subItem; - nodesToSave.add(ac); - if (ac.getContents() == null || ac.getContents().size() == 0) { - return true; - } - // look at all children - for (final CdmObject subSub : ac.getContents()) { - if (!saveStructureNodes(subSub, nodesToSave)) { - return false; - } - } - return true; - } - - // helper that save the passed node and anything up the parent chain - private boolean saveParentNodes(final CdmAttributeContext currNode, HashSet nodesToSave) { - if (nodesToSave.contains(currNode)) { - return true; - } - nodesToSave.add(currNode); - // get the parent - if (currNode.getParent() != null && currNode.getParent().getExplicitReference() != null) - { - return saveParentNodes((CdmAttributeContext)currNode.getParent().getExplicitReference(), nodesToSave); - } - return true; - } - - // helper that saves the current node (and parents) plus anything in the lineage (with their parents) - private boolean SaveLineageNodes(final CdmAttributeContext currNode, HashSet nodesToSave) { - if (!saveParentNodes(currNode, nodesToSave)) { - return false; - } - if (currNode.getLineage() != null && currNode.getLineage().size() > 0) { - for (final CdmAttributeContextReference lin : currNode.getLineage()) { - if (lin.getExplicitReference() != null) { - if (!SaveLineageNodes((CdmAttributeContext)lin.getExplicitReference(), nodesToSave)) { - return false; - } - } - } - } - return true; - } - private boolean cleanSubGroup(final CdmObject subItem, HashSet nodesToSave) { if (subItem.getObjectType() == CdmObjectType.AttributeRef) { return true; // not empty @@ -1120,6 +1068,9 @@ public CdmObject copy(ResolveOptions resOpt, CdmObject host) { return copy; } + /** + * @deprecated for internal use only. + */ @Override public ResolvedEntityReferenceSet fetchResolvedEntityReferences(ResolveOptions resOpt) { final boolean wasPreviouslyResolving = this.getCtx().getCorpus().isCurrentlyResolving; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmManifestDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmManifestDefinition.java index 7891f9ea4a..dd4715f587 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmManifestDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmManifestDefinition.java @@ -479,16 +479,16 @@ public CdmObject copy(ResolveOptions resOpt, CdmObject host) { copy.setLastChildFileModifiedTime(this.getLastChildFileModifiedTime()); copy.getEntities().clear(); - this.getEntities().forEach(copy.getEntities()::add); + this.getEntities().forEach(entityDec -> copy.getEntities().add((CdmEntityDeclarationDefinition) entityDec.copy(resOpt))); copy.getRelationships().clear(); - this.getRelationships().forEach(copy.getRelationships()::add); + this.getRelationships().forEach(relationship -> copy.getRelationships().add((CdmE2ERelationship) relationship.copy(resOpt))); copy.getSubManifests().clear(); - this.getSubManifests().forEach(copy.getSubManifests()::add); + this.getSubManifests().forEach(subManifest -> copy.getSubManifests().add((CdmManifestDeclarationDefinition) subManifest.copy(resOpt))); copy.getExhibitsTraits().clear(); - this.getExhibitsTraits().forEach(copy.getExhibitsTraits()::add); + this.getExhibitsTraits().forEach(trait -> copy.getExhibitsTraits().add((CdmTraitReferenceBase) trait.copy(resOpt))); return copy; } diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectBase.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectBase.java index bf2ec0e768..b903bb13e2 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectBase.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectBase.java @@ -19,6 +19,7 @@ import com.microsoft.commondatamodel.objectmodel.utilities.SymbolSet; import com.microsoft.commondatamodel.objectmodel.utilities.VisitCallback; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; @@ -457,6 +458,18 @@ public ResolvedAttributeSet fetchResolvedAttributes(ResolveOptions resOpt, ctx.getCorpus() .registerDefinitionReferenceSymbols(oDef, kind, resOpt.getSymbolRefSet()); + if (this.objectType == CdmObjectType.EntityDef) { + // if we just got attributes for an entity, take the time now to clean up this cached tree and prune out + // things that don't help explain where the final set of attributes came from + if (underCtx != null) { + HashSet scopesForAttributes = new HashSet(); + underCtx.collectContextFromAtts(rasbCache.getResolvedAttributeSet(), scopesForAttributes); // the context node for every final attribute + if (!underCtx.pruneToScope(scopesForAttributes)) { + return null; + } + } + } + // get the new cache tag now that we have the list of docs String cacheTag = ctx.getCorpus() .createDefinitionCacheTag(resOpt, this, kind, acpInContext != null ? "ctx" : null); diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectReferenceBase.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectReferenceBase.java index 252962f852..e8f7f89873 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectReferenceBase.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmObjectReferenceBase.java @@ -448,10 +448,8 @@ public T fetchObjectDefinition(ResolveOptions re } CdmObject def = this.fetchResolvedReference(resOpt); - if (def != null) { - if (def instanceof CdmObjectReference) { - def = ((CdmObjectReference)def).fetchResolvedReference(); - } + if (def != null && def instanceof CdmObjectReference) { + def = ((CdmObjectReference)def).fetchResolvedReference(); } if (def != null && !(def instanceof CdmObjectReference)) { return (T) def; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmReferencesEntities.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmReferencesEntities.java index f6dce6bc89..3c009b96e4 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmReferencesEntities.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmReferencesEntities.java @@ -7,5 +7,8 @@ import com.microsoft.commondatamodel.objectmodel.utilities.ResolveOptions; public interface CdmReferencesEntities { + /** + * @deprecated for internal use only. + */ ResolvedEntityReferenceSet fetchResolvedEntityReferences(ResolveOptions resOpt); } diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmTypeAttributeDefinition.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmTypeAttributeDefinition.java index 7ee6403a21..f4d92e7111 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmTypeAttributeDefinition.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/CdmTypeAttributeDefinition.java @@ -332,6 +332,7 @@ public ResolvedAttributeSetBuilder constructResolvedAttributes(final ResolveOpti // make a copy and add defaults if missing final CdmAttributeResolutionGuidance resGuideWithDefault; if (this.getResolutionGuidance() != null) { + resOpt.usedResolutionGuidance = true; resGuideWithDefault = (CdmAttributeResolutionGuidance) this.getResolutionGuidance().copy(resOpt); } else { resGuideWithDefault = new CdmAttributeResolutionGuidance(this.getCtx()); @@ -422,6 +423,9 @@ public CdmObject copy(ResolveOptions resOpt, CdmObject host) { return copy; } + /** + * @deprecated for internal use only. + */ @Override public ResolvedEntityReferenceSet fetchResolvedEntityReferences(final ResolveOptions resOpt) { // Return null intentionally. diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/EntityByReference.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/EntityByReference.java index c515a816bf..752a2feff5 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/EntityByReference.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/EntityByReference.java @@ -5,6 +5,8 @@ /** * Parameters that control the use of foreign keys to reference entity instances instead of imbedding the entity in a nested way. + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview */ public class EntityByReference { private Boolean allowReference; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/Expansion.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/Expansion.java index b85ff2c3e2..fad44795d7 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/Expansion.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/Expansion.java @@ -5,6 +5,8 @@ /** * Parameters that control array expansion if inline repeating of attributes is needed. + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview */ public class Expansion { public Integer startingOrdinal; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/SelectsSubAttribute.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/SelectsSubAttribute.java index e3b08c2240..f209f25541 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/SelectsSubAttribute.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/cdm/SelectsSubAttribute.java @@ -7,6 +7,8 @@ /** * used to indicate that this attribute select either 'one' or 'all' of the sub-attributes from an entity. If the 'structured' directive is set, this trait causes resolved attributes to end up in groups rather than a flattend list. + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview */ public class SelectsSubAttribute { private String selects; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/enums/CdmLogCode.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/enums/CdmLogCode.java index 84f5d00546..7fbee73ef3 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/enums/CdmLogCode.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/enums/CdmLogCode.java @@ -118,6 +118,7 @@ public enum CdmLogCode ErrValdnMissingLanguageTag, ErrUnrecognizedType, WarnPartitionGlobAndRegexPresent, + WarnDeprecatedResolutionGuidance, WarnDocChangesDiscarded, WarnDocImportNotLoaded, WarnPartitionFileFetchFailed, diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolveContext.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolveContext.java index a0a83a817a..c836f6b9a6 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolveContext.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolveContext.java @@ -13,7 +13,6 @@ import com.microsoft.commondatamodel.objectmodel.utilities.ResolveOptions; import com.microsoft.commondatamodel.objectmodel.utilities.logger.EventList; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Stack; @@ -22,7 +21,6 @@ public class ResolveContext implements CdmCorpusContext { final protected Map cache; String corpusPathRoot; - int errors; private Stack scopeStack; private ResolveContextScope currentScope; private CdmCorpusDefinition corpus; diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolvedAttributeSetBuilder.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolvedAttributeSetBuilder.java index 072416cc9d..39d4a42578 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolvedAttributeSetBuilder.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/resolvedmodel/ResolvedAttributeSetBuilder.java @@ -455,10 +455,9 @@ private ApplierContext makeResolvedAttribute(final ResolvedAttribute resAttSourc appCtx.resAttNew.completeContext(appCtx.resOpt); // tie this new resolved att to the source via lineage if (appCtx.resAttNew.getAttCtx() != null && resAttSource != null && resAttSource.getAttCtx() != null - && resAttSource.getApplierState() != null && resAttSource.getApplierState().getFlexRemove() != true){ + && (resAttSource.getApplierState() == null || !resAttSource.getApplierState().getFlexRemove())) { if (resAttSource.getAttCtx().getLineage() != null && resAttSource.getAttCtx().getLineage().size() > 0){ - for (final CdmAttributeContextReference lineage : resAttSource.getAttCtx().getLineage()) - { + for (final CdmAttributeContextReference lineage : resAttSource.getAttCtx().getLineage()) { appCtx.resAttNew.getAttCtx().addLineage(lineage); } } else{ diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/ResolveOptions.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/ResolveOptions.java index 38e703d992..13311773d1 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/ResolveOptions.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/ResolveOptions.java @@ -80,6 +80,11 @@ public class ResolveOptions { * @deprecated */ public HashSet currentlyResolvingEntities; + /** + * Indicates if resolution guidance was used at any point during resolution + * @deprecated + */ + public boolean usedResolutionGuidance = false; /** * Creates a new instance of Resolve Options using most common parameters. @@ -305,6 +310,7 @@ public ResolveOptions copy() { resOptCopy.importsLoadStrategy = this.importsLoadStrategy; resOptCopy.saveResolutionsOnCopy = this.saveResolutionsOnCopy; resOptCopy.currentlyResolvingEntities = new HashSet<>(this.currentlyResolvingEntities); + resOptCopy.usedResolutionGuidance = this.usedResolutionGuidance; if (this.directives != null) { resOptCopy.directives = this.directives.copy(); diff --git a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/logger/EventList.java b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/logger/EventList.java index 20faaee0ba..86adfaa606 100644 --- a/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/logger/EventList.java +++ b/objectModel/Java/objectmodel/src/main/java/com/microsoft/commondatamodel/objectmodel/utilities/logger/EventList.java @@ -5,6 +5,8 @@ import java.util.ArrayList; import java.util.Map; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; /** * EventList is a supporting class for the logging system and allows subset of messages @@ -35,12 +37,19 @@ public class EventList extends ArrayList> { */ private int nestingLevel = 0; + /** + * Lock to be used to enter and leave scope. + */ + Lock lock = new ReentrantLock(); + /** * Clears the log recorder and enables recoding of log messages. * @deprecated This function is extremely likely to be removed in the public interface, and not * meant to be called externally at all. Please refrain from using it. */ public void enable() { + lock.lock(); + // If we are going into nested recorded functions, we should not clear previously recorded events if (nestingLevel == 0) { clear(); @@ -48,6 +57,8 @@ public void enable() { } nestingLevel++; + + lock.unlock(); } /** @@ -56,11 +67,15 @@ public void enable() { * meant to be called externally at all. Please refrain from using it. */ public void disable() { + lock.lock(); + nestingLevel--; if (nestingLevel == 0) { isRecording = false; } + + lock.unlock(); } /** diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/ManifestDefinitionTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/ManifestDefinitionTest.java new file mode 100644 index 0000000000..1b3c2f939f --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/ManifestDefinitionTest.java @@ -0,0 +1,39 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +package com.microsoft.commondatamodel.objectmodel.cdm; + +import org.testng.Assert; +import org.testng.annotations.Test; + +public class ManifestDefinitionTest { + /** + * Tests if the copy function creates copies of the sub objects + */ + @Test + public void TestManifestCopy() { + CdmCorpusDefinition corpus = new CdmCorpusDefinition(); + CdmManifestDefinition manifest = new CdmManifestDefinition(corpus.getCtx(), "name"); + + String entityName = "entity"; + String subManifestName = "subManifest"; + String relationshipName = "relName"; + String traitName = "traitName"; + + CdmEntityDeclarationDefinition entityDec = manifest.getEntities().add(entityName); + CdmManifestDeclarationDefinition subManifest = manifest.getSubManifests().add(subManifestName); + CdmE2ERelationship relationship = manifest.getRelationships().add(relationshipName); + CdmTraitReferenceBase trait = manifest.getExhibitsTraits().add(traitName); + + CdmManifestDefinition copy = (CdmManifestDefinition) manifest.copy(); + copy.getEntities().get(0).setEntityName("newEntity"); + copy.getSubManifests().get(0).setManifestName("newSubManifest"); + copy.getRelationships().get(0).setName("newRelName"); + copy.getExhibitsTraits().get(0).setNamedReference("newTraitName"); + + Assert.assertEquals(entityDec.getEntityName(), entityName); + Assert.assertEquals(subManifest.getManifestName(), subManifestName); + Assert.assertEquals(relationship.getName(), relationshipName); + Assert.assertEquals(trait.getNamedReference(), traitName); + } +} diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/AttributeContextUtil.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/AttributeContextUtil.java index a6a12b6647..f7a5a573c8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/AttributeContextUtil.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/AttributeContextUtil.java @@ -137,11 +137,15 @@ private void getArgumentValues(CdmArgumentDefinition args) { } } + public static void validateAttributeContext(String expectedOutputPath, String entityName, CdmEntityDefinition resolvedEntity) { + AttributeContextUtil.validateAttributeContext(expectedOutputPath, entityName, resolvedEntity, false); + } + /** * A function to validate if the attribute context tree & traits generated for a resolved entity is the same as * the expected and saved attribute context tree & traits for a test case */ - public static void validateAttributeContext(CdmCorpusDefinition corpus, String expectedOutputPath, String entityName, CdmEntityDefinition resolvedEntity) { + public static void validateAttributeContext(String expectedOutputPath, String entityName, CdmEntityDefinition resolvedEntity, boolean updateExpectedOutput) { if (resolvedEntity.getAttributeContext() != null) { AttributeContextUtil attrCtxUtil = new AttributeContextUtil(); @@ -159,6 +163,12 @@ public static void validateAttributeContext(CdmCorpusDefinition corpus, String e // Expected Path expectedStringFilePath = new File(expectedOutputPath, "AttrCtx_" + entityName + ".txt").toPath(); + if (updateExpectedOutput) { + try (final BufferedWriter expectedFileWriter = Files.newBufferedWriter(expectedStringFilePath, StandardCharsets.UTF_8, StandardOpenOption.CREATE);) { + expectedFileWriter.write(actualText); + expectedFileWriter.flush(); + } + } final String expectedText = new String(Files.readAllBytes(expectedStringFilePath), StandardCharsets.UTF_8); // Test if Actual is Equal to Expected diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/ProjectionAddSupportingAttributeTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/ProjectionAddSupportingAttributeTest.java index ba3d267100..bfd4f03b45 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/ProjectionAddSupportingAttributeTest.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/projection/ProjectionAddSupportingAttributeTest.java @@ -25,7 +25,7 @@ public class ProjectionAddSupportingAttributeTest { Arrays.asList( new ArrayList<>(Arrays.asList()), new ArrayList<>(Arrays.asList("referenceOnly")), - new ArrayList<>(Arrays.asList("normalized")), new ArrayList<>(Arrays.asList("structured")), + new ArrayList<>(Arrays.asList("normalized", "structured")), new ArrayList<>(Arrays.asList("referenceOnly", "normalized")), new ArrayList<>(Arrays.asList("referenceOnly", "virtual")), new ArrayList<>(Arrays.asList("referenceOnly", "structured")), diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/relationship/CalculateRelationshipTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/relationship/CalculateRelationshipTest.java index 0627631306..dbaebd46ee 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/relationship/CalculateRelationshipTest.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/relationship/CalculateRelationshipTest.java @@ -4,6 +4,8 @@ package com.microsoft.commondatamodel.objectmodel.cdm.relationship; import com.microsoft.commondatamodel.objectmodel.TestHelper; +import com.microsoft.commondatamodel.objectmodel.persistence.cdmfolder.types.AttributeContext; +import com.microsoft.commondatamodel.objectmodel.persistence.modeljson.types.Attribute; import com.microsoft.commondatamodel.objectmodel.utilities.ProjectionTestUtils; import com.microsoft.commondatamodel.objectmodel.cdm.*; import com.microsoft.commondatamodel.objectmodel.cdm.projection.AttributeContextUtil; @@ -139,7 +141,14 @@ public void testCompositeKeyNonPolymorphicRelationship() throws IOException, Int /** * Common test code for these test cases */ - private void testRun(String testName, String entityName, boolean isEntitySet) throws InterruptedException, IOException { + private void testRun(String testName, String entityName, boolean isEntitySet) throws IOException, InterruptedException { + testRun(testName, entityName, isEntitySet, false); + } + + /** + * Common test code for these test cases + */ + private void testRun(String testName, String entityName, boolean isEntitySet, boolean updateExpectedOutput) throws InterruptedException, IOException { CdmCorpusDefinition corpus = TestHelper.getLocalCorpus(TESTS_SUBPATH, testName, null); String inputFolder = TestHelper.getInputFolderPath(TESTS_SUBPATH, testName); String expectedOutputFolder = TestHelper.getExpectedOutputFolderPath(TESTS_SUBPATH, testName); @@ -156,16 +165,8 @@ private void testRun(String testName, String entityName, boolean isEntitySet) th Assert.assertNotNull(entity); CdmEntityDefinition resolvedEntity = ProjectionTestUtils.getResolvedEntity(corpus, entity, new ArrayList(Arrays.asList("referenceOnly"))).join(); assertEntityShapeInResolvedEntity(resolvedEntity, isEntitySet); - String actualAttrCtx = getAttributeContextString(resolvedEntity, entityName, actualOutputFolder); - try { - final String expectedAttrCtx = new String(Files.readAllBytes( - new File(expectedOutputFolder, "AttrCtx_" + entityName + ".txt").toPath()), - StandardCharsets.UTF_8); - Assert.assertEquals(actualAttrCtx, expectedAttrCtx); - } catch (Exception e) { - Assert.fail(e.getMessage()); - } + AttributeContextUtil.validateAttributeContext(expectedOutputFolder, entityName, resolvedEntity, updateExpectedOutput); corpus.calculateEntityGraphAsync(manifest).join(); manifest.populateManifestRelationshipsAsync().join(); diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTest.java index f908370869..0a9f062665 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTest.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTest.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; @@ -15,11 +16,13 @@ import com.google.common.base.Strings; import com.microsoft.commondatamodel.objectmodel.TestHelper; import com.microsoft.commondatamodel.objectmodel.cdm.*; +import com.microsoft.commondatamodel.objectmodel.cdm.projection.AttributeContextUtil; import com.microsoft.commondatamodel.objectmodel.resolvedmodel.ResolvedAttributeSet; import com.microsoft.commondatamodel.objectmodel.storage.LocalAdapter; import com.microsoft.commondatamodel.objectmodel.storage.StorageAdapterBase; import com.microsoft.commondatamodel.objectmodel.utilities.AttributeResolutionDirectiveSet; import com.microsoft.commondatamodel.objectmodel.utilities.InterceptLog; +import com.microsoft.commondatamodel.objectmodel.utilities.ProjectionTestUtils; import com.microsoft.commondatamodel.objectmodel.utilities.ResolveOptions; import org.apache.logging.log4j.Level; @@ -293,4 +296,19 @@ public void testResolveTestCorpus() throws Exception { final String allResolved = ResolutionTestUtils.listAllResolved(cdmCorpus, directives, manifest, new StringSpewCatcher()); assert (!Strings.isNullOrEmpty(allResolved)); } + + /** + * Test whether or not the test corpus can be resolved The input of this test is + * a manifest from SchemaDocs, so this test does not need any individual input + * files. This test does not check the output. Possibly because the schema docs + * change often. + */ + @Test + public void testAppliedTraitsInAttributes() throws Exception { + final CdmCorpusDefinition corpus = TestHelper.getLocalCorpus(TESTS_SUBPATH, "testAppliedTraitsInAttributes", null); + String expectedOutputFolder = TestHelper.getExpectedOutputFolderPath(TESTS_SUBPATH, "testAppliedTraitsInAttributes"); + CdmEntityDefinition entity = corpus.fetchObjectAsync("local:/Sales.cdm.json/Sales").join(); + CdmEntityDefinition resolvedEntity = ProjectionTestUtils.getResolvedEntity(corpus, entity, new ArrayList(Arrays.asList("referenceOnly"))).join(); + AttributeContextUtil.validateAttributeContext(expectedOutputFolder, "Sales", resolvedEntity); + } } diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTraitGroupTests.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTraitGroupTests.java index f76cb40a62..6b74c12453 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTraitGroupTests.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolution/EntityResolutionTraitGroupTests.java @@ -40,7 +40,11 @@ public void testTraitsFromTraitGroup() throws InterruptedException { CdmCorpusDefinition cdmCorpus = TestHelper.getLocalCorpus(TESTS_SUBPATH, "TestResolvedTraitGroup"); cdmCorpus.setEventCallback( - (CdmStatusLevel level, String message) -> Assert.fail("Received " + level + " message: " + message), + (CdmStatusLevel level, String message) -> { + if (!message.contains("Resolution guidance is being deprecated in favor of Projections.")) { + Assert.fail("Received " + level + " message: " + message); + } + }, CdmStatusLevel.Warning); CdmEntityDefinition ent = (CdmEntityDefinition) cdmCorpus.fetchObjectAsync("local:/E2EResolution/Contact.cdm.json/Contact").join(); diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/CommonTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/CommonTest.java index 12044cc254..89ba6eb773 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/CommonTest.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/CommonTest.java @@ -34,6 +34,56 @@ public class CommonTest { */ protected static final String TESTS_SUBPATH = new File("cdm", "resolutionguidance").toString(); + /** + * This method runs the tests with a set expected attributes & attribute context values and validated the actual result. + */ + protected static CompletableFuture runTestWithValues( + final String testName, + final String sourceEntityName, + + final AttributeContextExpectedValue expectedContext_default, + final AttributeContextExpectedValue expectedContext_normalized, + final AttributeContextExpectedValue expectedContext_referenceOnly, + final AttributeContextExpectedValue expectedContext_structured, + final AttributeContextExpectedValue expectedContext_normalized_structured, + final AttributeContextExpectedValue expectedContext_referenceOnly_normalized, + final AttributeContextExpectedValue expectedContext_referenceOnly_structured, + final AttributeContextExpectedValue expectedContext_referenceOnly_normalized_structured, + + final List expected_default, + final List expected_normalized, + final List expected_referenceOnly, + final List expected_structured, + final List expected_normalized_structured, + final List expected_referenceOnly_normalized, + final List expected_referenceOnly_structured, + final List expected_referenceOnly_normalized_structured + ) { + return runTestWithValues( + testName, + sourceEntityName, + + expectedContext_default, + expectedContext_normalized, + expectedContext_referenceOnly, + expectedContext_structured, + expectedContext_normalized_structured, + expectedContext_referenceOnly_normalized, + expectedContext_referenceOnly_structured, + expectedContext_referenceOnly_normalized_structured, + + expected_default, + expected_normalized, + expected_referenceOnly, + expected_structured, + expected_normalized_structured, + expected_referenceOnly_normalized, + expected_referenceOnly_structured, + expected_referenceOnly_normalized_structured, + false + ); + } + /** * This method runs the tests with a set expected attributes & attribute context values and validated the actual result. */ @@ -57,7 +107,8 @@ protected static CompletableFuture runTestWithValues( final List expected_normalized_structured, final List expected_referenceOnly_normalized, final List expected_referenceOnly_structured, - final List expected_referenceOnly_normalized_structured + final List expected_referenceOnly_normalized_structured, + final boolean updateExpectedOutput ) { return CompletableFuture.runAsync(() -> { try { @@ -77,7 +128,7 @@ protected static CompletableFuture runTestWithValues( CdmFolderDefinition outFolder = (CdmFolderDefinition) corpus.fetchObjectAsync(outFolderPath).join(); CdmEntityDefinition srcEntityDef = (CdmEntityDefinition)corpus.fetchObjectAsync("local:/Input/"+ sourceEntityName + ".cdm.json/" + sourceEntityName).join(); - Assert.assertTrue(srcEntityDef != null); + Assert.assertNotNull(srcEntityDef); ResolveOptions resOpt = new ResolveOptions(srcEntityDef.getInDocument()); diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/ResolutionGuidanceTest.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/ResolutionGuidanceTest.java index 82eb4a7bde..385a8ce67b 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/ResolutionGuidanceTest.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/cdm/resolutionguidance/ResolutionGuidanceTest.java @@ -12,6 +12,7 @@ import com.microsoft.commondatamodel.objectmodel.cdm.EntityByReference; import com.microsoft.commondatamodel.objectmodel.cdm.Expansion; import com.microsoft.commondatamodel.objectmodel.cdm.SelectsSubAttribute; +import com.microsoft.commondatamodel.objectmodel.enums.CdmLogCode; import com.microsoft.commondatamodel.objectmodel.persistence.CdmConstants; import com.microsoft.commondatamodel.objectmodel.storage.GithubAdapter; import com.microsoft.commondatamodel.objectmodel.storage.LocalAdapter; @@ -285,6 +286,29 @@ private static void validateOutput( } } + /** + * Tests if a warning is logged if resolution guidance is used + */ + @Test + public void testResolutionGuidanceDeprecation() throws InterruptedException { + CdmCorpusDefinition corpus = TestHelper.getLocalCorpus(TESTS_SUBPATH, "testResolutionGuidanceDeprecation", null); + + // Tests warning log when resolution guidance is used on a data typed attribute. + CdmEntityDefinition entity = corpus.fetchObjectAsync("local:/TypeAttribute.cdm.json/Entity").join(); + entity.createResolvedEntityAsync("res-entity").join(); + TestHelper.assertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used on a entity typed attribute. + entity = corpus.fetchObjectAsync("local:/EntityAttribute.cdm.json/Entity").join(); + entity.createResolvedEntityAsync("res-entity").join(); + TestHelper.assertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used when extending an entity. + entity = corpus.fetchObjectAsync("local:/ExtendsEntity.cdm.json/Entity").join(); + entity.createResolvedEntityAsync("res-entity").join(); + TestHelper.assertCdmLogCodeEquality(corpus, CdmLogCode.WarnDeprecatedResolutionGuidance); + } + @Test public void testResolutionGuidanceCopy() { final CdmCorpusDefinition corpus = new CdmCorpusDefinition(); diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/fromEntity.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/fromEntity.cdm.json index 4b2bb12b66..c8af66d1eb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/fromEntity.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/fromEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "symbolEntityAttribute", "entity": { - "entityReference": "symbolEntity" + "source": "symbolEntity" } } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/symbolEntity.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/symbolEntity.cdm.json index 4bccd86ce4..2363f446fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/symbolEntity.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/corpus/testResolveSymbolReference/Input/symbolEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "fromEntityAttribute", "entity": { - "entityReference": "fromEntity" + "source": "fromEntity" } } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testForwardCompatibility/testAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testForwardCompatibility/testAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt new file mode 100644 index 0000000000..72e754ca66 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testForwardCompatibility/testAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt @@ -0,0 +1,105 @@ +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count/Resolved_TestAllOperations/hasAttributes/count/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support/Resolved_TestAllOperations/hasAttributes/support/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName/Resolved_TestAllOperations/hasAttributes/type/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/A@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/B@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/C@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/A@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/B@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/C@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3/Resolved_TestAllOperations/hasAttributes/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3/Resolved_TestAllOperations/hasAttributes/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3/Resolved_TestAllOperations/hasAttributes/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A/combined +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined/Resolved_TestAllOperations/hasAttributes/combined/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA/Resolved_TestAllOperations/hasAttributes/NewA/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_TestAllOperations/hasAttributes/A_FK/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/B +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/C +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/count +is.linkedEntity.array.count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/support +is.addedInSupportOf + [Parameter (Name / DefaultValue): inSupportOf / ] + [Argument Value: C] +is.virtual.attribute +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/type +is.linkedEntity.name +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/NewA +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A_FK +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/TestSource.cdm.json/TestSource,A,replaceFK_TestSource] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 64a36ebe69..5239494af2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,7 +14,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ec454952ae..705379816f 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -25,6 +23,9 @@ output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email/Resolved_NewPerson/hasAttributes/PersonAttributeGroup/members/email/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age/Resolved_NewPerson/hasAttributes/age/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/phoneNumber diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 4f0170be17..10d548107c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fbe5e69ceb..dc1df898c4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed0342ab77..e483ba2d07 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddAttributeGroup/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index bba3a7ad2b..053f314830 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9ac859b512..96031b910d 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63e35d480f..f4e2eb25b5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/address @@ -26,10 +24,16 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/new_name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/new_age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/new_address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount/new_someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name/Resolved_NewPerson/hasAttributes/new_name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index fe0a943be1..57c16bb0c5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,11 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt index 12ff168557..4f8dfb0f6c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt index ff3191b029..0a66e586a2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,11 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 2242d30372..adef43a487 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 5784b79231..02649fc140 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,11 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 46a33e42d5..bb8697d6f8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 1796b68a1b..e3930cb4cf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 52fbd75e21..8fb465ecae 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddCount/testWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,8 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 113df5475a..1429f693f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 387cf51fad..ac8a8d5b12 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 85e00ba0d2..93368744c9 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddSupportingAttr/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,13 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt index 901dbaea00..fcb83a949a 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt @@ -18,6 +18,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/emailId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone @@ -27,6 +28,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social @@ -36,6 +38,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationCombineAttributes @@ -57,6 +60,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/contactId/new_contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/account +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary/Resolved_Customer/hasAttributes/new_isPrimary/(ref) Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_contactId diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAddType/testCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt index 901113431d..4be9f15092 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt @@ -8,8 +8,6 @@ Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityA Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_NestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt index be2ef5e795..9823f1a921 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt @@ -4,8 +4,6 @@ Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAtt Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends/CdmEntity Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute/Resolved_TestEntAttrProj/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/hasAttributes/TestAttribute diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt index 621bbdff6c..73ea0f76d0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt @@ -6,8 +6,6 @@ Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedPr Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt index bd0ee0d0e0..814d044be0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionAttributeContext/testEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt @@ -2,8 +2,6 @@ Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/ext Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute/Resolved_TestEntityProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/hasAttributes/TestAttribute diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionCombine/testExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 56c9ca1d91..55f2d99206 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index e13c431847..6862d18e21 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,36 +4,32 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/age1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/address1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/phoneNumber1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/email1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/name2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/age2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/address2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/phoneNumber2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/email2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/name3 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/address3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/phoneNumber3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/email3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name1 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 6e2d14df45..4bdc8ca315 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 4b41c95d04..6ba7fc48ac 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/address @@ -16,13 +14,12 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure @@ -33,6 +30,7 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/_generatedAttributeSet_template/_generatedAttributeRound0/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAge Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName/Resolved_NewPerson/hasAttributes/PersonInfoName/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAddress diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index 234543d415..8550bf5b79 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt index f9e05b0dec..68621afccf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends/CdmEntity -Resolved_Child/attributeContext/Resolved_Child/extends/Person/phoneNumber -Resolved_Child/attributeContext/Resolved_Child/extends/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/Person/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/Person/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 625b0a7a4d..7d661e88bc 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address @@ -11,6 +9,8 @@ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6a89967584..a212526b27 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 7aa34cf438..903904e129 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name @@ -15,6 +13,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index c36d9dde63..027e4bf78c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed9ac5a1c6..473afb5dec 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -15,9 +13,11 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttr Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 33546136cc..c36c5487ab 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,8 +14,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index 3ce7c5663d..e2b169e510 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -22,8 +22,6 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/Conta Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index e4d8c86a78..ae86ac7875 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -29,9 +29,13 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/proje Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId/Resolved_BusinessPerson/hasAttributes/emailId/(ref) Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt index 340219c676..5ae50a2833 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93a0378283..3513cdb156 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93ddb42189..1d3f746d7b 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address @@ -21,6 +19,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 8db35dbc0e..7e8c14168b 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExclude/testTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -3,6 +3,9 @@ Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity Resolved_Person/attributeContext/Resolved_Person/address Resolved_Person/attributeContext/Resolved_Person/address/projection Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_Person/attributeContext/Resolved_Person/name output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) Resolved_Person/attributeContext/Resolved_Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 85b0b16f15..56b912d14b 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index fba97959fb..1e1d1b2d2f 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -6,15 +6,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/project Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d5835ac6a..6c64c2fba6 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -8,8 +8,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/address @@ -18,10 +16,15 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name @@ -34,8 +37,34 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1/name1 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 1d9a8fec7b..ab08ce5691 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index a1ab17f96e..c89b71b328 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,9 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d483f37ee..dc353d7f95 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/proje Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 2dee2a32b1..e8be825363 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,9 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index b4f6d6a15c..e5929f6606 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 3b0394191b..aea14a2abd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index e2a448d6d9..e9f820c691 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -10,8 +10,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index efcd7768c1..e7125e5f4c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -2,14 +2,8 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count/Resolved_BusinessPerson/hasAttributes/count/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index d0cfd18e37..153f9f0498 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 451f798133..956998c967 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionExpansion/testStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 886c0b69ab..c4d1e41357 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 0d82aa406e..397a36fe71 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -4,14 +4,7 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt index 7ba825ce11..d1b9eb3648 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt @@ -6,11 +6,6 @@ Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesComp Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends/CdmEntity -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId1 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId2 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductName Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt index d31b13c0ed..f6df6e1030 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt @@ -4,8 +4,6 @@ Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/Pro Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesEntityAttribute.cdm.json/Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId/Resolved_SalesEntityAttribute/hasAttributes/ProductId/(ref) Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt index da5e883690..13ec6bfbcd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt @@ -6,10 +6,6 @@ Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignK Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends/CdmEntity -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductId -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductName Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt index 58af7e7a06..ec1e398a75 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt @@ -6,12 +6,6 @@ Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProd Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends/CdmEntity -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductId -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductName Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt index c3364db34b..0e9d939e6f 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt @@ -14,10 +14,6 @@ Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyPr Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductId -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductName Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt index 635a1ff340..f7190014d0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt @@ -6,30 +6,6 @@ Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSo Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/emailId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/address -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/phoneId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/number -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/socialId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/account -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/userId Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt index 0e68c393b3..3fb817b20e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/_generatedAttributeSet_template diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionFK/testSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_default.txt index ab8e8fee6e..a97f3125d5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArray/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt index 03d878aa31..7565883fd2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt @@ -4,22 +4,24 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount/Resolved_Sales/hasAttributes/ThreeProductsBoughtProductCount/(ref) Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt index d6715c3692..51c0b10a5b 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_default.txt index be98618843..1e26c2d143 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_default.txt @@ -5,7 +5,6 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/ExpectedOutput/AttrCtx_Color_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/Color.cdm.json index 2ba9ad4d7d..ecb74df2b3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEA/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/ExpectedOutput/AttrCtx_Color_default.txt index 0d47ce3fcd..22ebf8885d 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -10,6 +10,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Bl Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/Color.cdm.json index 41552fc2fa..dae1745ae1 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEAProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/ExpectedOutput/AttrCtx_Color_default.txt index c09cc5b7be..a9e2baa382 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,9 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/Color.cdm.json index 5abcebb4b5..2daa8013bd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmpty/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt index eaddf1ea34..3a9f533f8f 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -6,6 +6,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Re Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Blue Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/Color.cdm.json index 7fff0c62f7..97e0fb9419 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testEmptyProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/ExpectedOutput/AttrCtx_Color_default.txt index 50305e8aa7..37d015bfd5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,6 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/extends Resolved_Color/attributeContext/Resolved_Color/extends/RGB -Resolved_Color/attributeContext/Resolved_Color/extends/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/Color.cdm.json index 6e21fa79e7..1f09b811ce 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtends/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt index aeace0b5f7..9ac59f31dd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -8,6 +8,7 @@ Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/Blu Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/Color.cdm.json index 336dd1359e..d60c3a3c6e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testExtendsProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_default.txt index fbcfdd01d7..3eb421bd9a 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_default.txt @@ -1,12 +1,9 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Blue -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupName/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt index e5384d5c2b..e48ae8c044 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt @@ -12,9 +12,14 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/sourc Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Blue +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorGreen +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorIsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed output:/Resolved_Product.cdm.json/Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed/Resolved_Product/hasAttributes/RGBColorRed/(ref) Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorBlue diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testGroupNameProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/Color.cdm.json index d20b08d8db..dd877c2f25 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 1dc4c8a2be..5c569d0d07 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/Color.cdm.json index b63a983b03..98b1b331dc 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested1of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 666afef429..0c63cfe79d 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/Color.cdm.json index b897cbb23b..402eb1c49c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested2of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index ad53e24427..951fab6abe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/Color.cdm.json index 8ad4a22f97..044f7e906d 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNested3of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt index 376e456b6a..b633133155 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -13,9 +13,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Blue diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/Color.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/Color.cdm.json index 2dc0d4b84f..cb1c157e1a 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testNestedIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt index dccb87fae9..cac7796e75 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt @@ -6,28 +6,19 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt index 06cc3332e2..dac5f713c5 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -14,7 +14,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId @@ -23,7 +26,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId @@ -32,9 +38,17 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address/Resolved_Person/hasAttributes/address/(ref) Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionInclude/testPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 2e18a46eed..c2c21e4a44 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 5a6f7c15c7..9041edb2de 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index bbe19ae0b1..3918bddf01 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9e61059ac5..fbb20f9752 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 87814dadf3..f524413365 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fb1d9ada27..486536056a 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6726bb4db2..b4a66a23bd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 268ac036c4..f35d5b47f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 8fa72f3167..44527c5129 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -17,12 +15,19 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/PersonInfo--Name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/PersonInfo--Age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/PersonInfo--Address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email/PersonInfo--Email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name/Resolved_NewPerson/hasAttributes/PersonInfo--Name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 415417f2cf..5879d287e1 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index e3a281f24d..8dfa526d62 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/projection/testProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index 3aa72deebc..a440fca681 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,name,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,number,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index bbdf2b7560..7562f5c719 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Address.cdm.json/Address,name,something_Address] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Phone.cdm.json/Phone,number,something_Phone] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 94997e5824..83436a8455 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,11 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -25,6 +20,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -37,6 +38,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt index be6fe66d8a..cf2989287d 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 73db8ce2d9..dc4b8c111e 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -8,11 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/proje Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -29,6 +24,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -41,6 +42,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt index 3006759dc1..d34d706446 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt @@ -2,24 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -38,6 +20,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,isPrimary,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,isPrimary,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,isPrimary,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -52,6 +40,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,userId,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,userId,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,userId,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt index 82607e3c41..5e2521d4aa 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/relationship/testCalculateRelationship/testWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt new file mode 100644 index 0000000000..ff26b6ceb0 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt @@ -0,0 +1,44 @@ +Resolved_Sales/attributeContext/Resolved_Sales/extends +Resolved_Sales/attributeContext/Resolved_Sales/extends/CdmEntity +Resolved_Sales/attributeContext/Resolved_Sales/SalesName +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SalesName/Resolved_Sales/hasAttributes/SalesName/(ref) +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_Sales/hasAttributes/FKId1/(ref) +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/SalesName +is.dataFormat.numeric.shaped + [Parameter (Name / DefaultValue): precision / ] + [Argument Value: 15] + [Parameter (Name / DefaultValue): scale / ] + [Argument Value: -1] +has.description + [Parameter (Name / DefaultValue): description / ] + [Argument Value: en,testing purpose trait on a type attribute.] +means.idea.project +means.idea.scenario +is.dataFormat.numeric.shaped +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/FKId1 +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.guid +means.identity.entityId +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] +means.idea.project +means.idea.scenario +is.dataFormat.guid +is.dataFormat.character +is.dataFormat.array diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Product.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Product.cdm.json new file mode 100644 index 0000000000..c45eaa3b90 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Product.cdm.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Product", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "purpose": "hasA", + "dataType": "integer", + "name": "ProductId1" + }, + { + "purpose": "hasA", + "dataType": "string", + "name": "ProductName" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Sales.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Sales.cdm.json new file mode 100644 index 0000000000..ad4113ca02 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/Sales.cdm.json @@ -0,0 +1,125 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Sales", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "dataType": { + "dataTypeReference": "decimal", + "appliedTraits": [ + { + "traitReference": "is.dataFormat.numeric.shaped", + "arguments": [ + { + "name": "precision", + "value": "15" + }, + { + "name": "scale", + "value": "-1" + } + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "has.description", + "arguments": [ + { + "entityReference": { + "entityShape": "localizedTable", + "constantValues": [ + [ + "en", + "testing purpose trait on a type attribute." + ] + ] + } + } + ] + } + ] + }, + "name": "SalesName" + }, + { + "name": "SaleEAKey", + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "means.forward", + "arguments": [ + "Description for the forward direction in the relationship." + ] + }, + { + "traitReference": "means.backward", + "arguments": [ + "Description for the backward direction in the relationship." + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "entity": { + "source": "Product", + "operations": [ + { + "$type": "replaceAsForeignKey", + "reference": "ProductId1", + "replaceWith": { + "dataType": "entityId", + "name": "FKId1" + } + } + ] + } + } + ], + "version": "1.0" + }, + { + "traitName": "means.backward", + "explanation": "the attribute represents B->A.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship B->A", + "required": false + } + ] + }, + { + "traitName": "means.forward", + "explanation": "the attribute represents A->B.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship A->B", + "required": false + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/_allImports.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/_allImports.cdm.json new file mode 100644 index 0000000000..4cd76e31b8 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/_allImports.cdm.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "Product.cdm.json" + }, + { + "corpusPath": "Sales.cdm.json" + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/default.manifest.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/default.manifest.cdm.json new file mode 100644 index 0000000000..d06466170d --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolution/entityresolution/testAppliedTraitsInAttributes/Input/default.manifest.cdm.json @@ -0,0 +1,25 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "manifestName": "default.manifest.cdm.json", + "entities": [ + { + "type": "LocalEntity", + "entityName": "Product", + "entityPath": "Product.cdm.json/Product" + }, + { + "type": "LocalEntity", + "entityName": "Sales", + "entityPath": "Sales.cdm.json/Sales" + } + ], + "relationships": [ + { + "fromEntity": "Sales.cdm.json/Sales", + "fromEntityAttribute": "FKId1", + "toEntity": "Product.cdm.json/Product", + "toEntityAttribute": "ProductId1" + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json new file mode 100644 index 0000000000..1a293e720c --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "BaseEntity", + "hasAttributes": [ + { + "name": "email", + "dataType": "string" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json new file mode 100644 index 0000000000..ac2905871f --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json new file mode 100644 index 0000000000..a17c5abad9 --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "extendsEntity": "BaseEntity", + "extendsEntityResolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + }, + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json new file mode 100644 index 0000000000..d04d2cd88e --- /dev/null +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/cdm/resolutionguidance/testResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "dataType": "string", + "resolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/ExpectedOutput/output.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/ExpectedOutput/output.txt index 66503b91f7..e489690c99 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/ExpectedOutput/output.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/ExpectedOutput/output.txt @@ -5,221 +5,7 @@ List of storage adapters: 4: ADLSAdapter Pick a number to configure that storage adapter or press [enter] to exit. -Enter a RootPath for the LocalAdapter. (Ex. "../example-public-standards") - -LocalAdapter configured. Properties of this LocalAdapter are: - Root: ../../../../../../example-public-standards" - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -The CdmStandardsAdapter has optional parameters. Would you like to configure them? (yes/no) - -Enter a Timeout for the CdmStandardsAdapter, or press [enter] to skip. (Ex. "2000"). Default is 2000. - -Enter a MaximumTimeout for the CdmStandardsAdapter, or press [enter] to skip. (Ex. "10000"). Default is 10000. - -Enter a NumberOfRetries for the CdmStandardsAdapter, or press [enter] to skip. (Ex. "2"). Default is 2. - -CdmStandardsAdapter configured. Properties of this CdmStandardsAdapter are: - Timeout: PT1S - MaximumTimeout: 5000 - NumberOfRetries: 1 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -The CdmStandardsAdapter has optional parameters. Would you like to configure them? (yes/no) - -CdmStandardsAdapter configured. Properties of this CdmStandardsAdapter are: - Timeout: PT2S - MaximumTimeout: 10000 - NumberOfRetries: 2 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. -The RemoteAdapter contains a dictionary of hosts. The mapping is from a key to a host. (Ex. { "contoso": "http://contoso.com" }) -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). -Enter the host. (Ex. "http://contoso.com"). -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). -Enter the host. (Ex. "http://contoso.com"). -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). - -The RemoteAdapter has optional parameters. Would you like to configure them? (yes/no) - -Enter a Timeout for the RemoteAdapter, or press [enter] to skip. (Ex. "2000"). Default is 2000. - -Enter a MaximumTimeout for the RemoteAdapter, or press [enter] to skip. (Ex. "10000"). Default is 10000. - -Enter a NumberOfRetries for the RemoteAdapter, or press [enter] to skip. (Ex. "2"). Default is 2. - -RemoteAdapter configured. Properties of this RemoteAdapter are: - Hosts: -{'contoso2' : 'http://contoso2.com'} -{'contoso' : 'http://contoso.com'} - Timeout: 1000 - MaximumTimeout: 5000 - NumberOfRetries: 1 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. -The RemoteAdapter contains a dictionary of hosts. The mapping is from a key to a host. (Ex. { "contoso": "http://contoso.com" }) -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). -Enter the host. (Ex. "http://contoso.com"). -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). -Enter the host. (Ex. "http://contoso.com"). -Enter the key for the host, or press [enter] if you're done adding hosts. (Ex. "contoso"). - -The RemoteAdapter has optional parameters. Would you like to configure them? (yes/no) - -RemoteAdapter configured. Properties of this RemoteAdapter are: - Hosts: -{'contoso2' : 'http://contoso2.com'} -{'contoso' : 'http://contoso.com'} - Timeout: 2000 - MaximumTimeout: 10000 - NumberOfRetries: 2 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -Enter 1 to configure the ADLSAdapter through a shared key authentication. Enter 2 to configure through a token authentication. - -Enter a HostName for the ADLSAdapter. (Ex. "test.dfs.core.windows.net") - -Enter a Root for the ADLSAdapter. (Ex. "../example-public-standards") - -Enter a SharedKey for the ADLSAdapter. (Ex. "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") - -The ADLSAdapter has optional parameters. Would you like to configure them? (yes/no) - -Enter a Timeout for the ADLSAdapter, or press [enter] to skip. (Ex. "2000"). Default is 2000. - -Enter a MaximumTimeout for the ADLSAdapter, or press [enter] to skip. (Ex. "10000"). Default is 10000. - -Enter a NumberOfRetries for the ADLSAdapter, or press [enter] to skip. (Ex. "2"). Default is 2. - -ADLSAdapter configured. Properties of this ADLSAdapter are: - HostName: test.dfs.core.windows.net - Root: /example-public-standards - SharedKey: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - Timeout: PT1S - MaximumTimeout: 5000 - NumberOfRetries: 1 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -Enter 1 to configure the ADLSAdapter through a shared key authentication. Enter 2 to configure through a token authentication. - -Enter a HostName for the ADLSAdapter. (Ex. "test.dfs.core.windows.net") - -Enter a Root for the ADLSAdapter. (Ex. "../example-public-standards") - -Enter a SharedKey for the ADLSAdapter. (Ex. "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") - -The ADLSAdapter has optional parameters. Would you like to configure them? (yes/no) - -ADLSAdapter configured. Properties of this ADLSAdapter are: - HostName: test.dfs.core.windows.net - Root: /example-public-standards - SharedKey: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - Timeout: PT2S - MaximumTimeout: 10000 - NumberOfRetries: 2 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -Enter 1 to configure the ADLSAdapter through a shared key authentication. Enter 2 to configure through a token authentication. - -Enter a SharedKey for the ADLSAdapter. (Ex. "test.dfs.core.windows.net") - -Enter a RootPath for the ADLSAdapter. (Ex. "../example-public-standards") - -Enter a Tenant for the ADLSAdapter. (Ex. "00x000xx-00x0-00xx-00xx-0x0xx000xx00") - -Enter a ClientId for the ADLSAdapter. (Ex. "xxx00x0x-0x00-0000-x0x0-00xxx000xxx0") - -Enter a Secret for the ADLSAdapter. (Ex. "xSDfdzI92d:sd832j8jd@ac823sSglJ") - -The ADLSAdapter has optional parameters. Would you like to configure them? (yes/no) - -ADLSAdapter configured. Properties of this ADLSAdapter are: - Hostname: test.dfs.core.windows.net - Root: /example-public-standards - Tenant: 00x000xx-00x0-00xx-00xx-0x0xx000xx00 - ClientId: xxx00x0x-0x00-0000-x0x0-00xxx000xxx0 - Secret: xSDfdzI92d:sd832j8jd@ac823sSglJ - Timeout: PT2S - MaximumTimeout: 10000 - NumberOfRetries: 2 - -List of storage adapters: - 1: LocalAdapter - 2: CdmStandardsAdapter - 3: RemoteAdapter - 4: ADLSAdapter -Pick a number to configure that storage adapter or press [enter] to exit. - -Enter 1 to configure the ADLSAdapter through a shared key authentication. Enter 2 to configure through a token authentication. - -Enter a SharedKey for the ADLSAdapter. (Ex. "test.dfs.core.windows.net") - -Enter a RootPath for the ADLSAdapter. (Ex. "../example-public-standards") - -Enter a Tenant for the ADLSAdapter. (Ex. "00x000xx-00x0-00xx-00xx-0x0xx000xx00") - -Enter a ClientId for the ADLSAdapter. (Ex. "xxx00x0x-0x00-0000-x0x0-00xxx000xxx0") - -Enter a Secret for the ADLSAdapter. (Ex. "xSDfdzI92d:sd832j8jd@ac823sSglJ") - -The ADLSAdapter has optional parameters. Would you like to configure them? (yes/no) - -Enter a Timeout for the ADLSAdapter, or press [enter] to skip. (Ex. "2000"). Default is 2000. - -Enter a MaximumTimeout for the ADLSAdapter, or press [enter] to skip. (Ex. "10000"). Default is 10000. - -Enter a NumberOfRetries for the ADLSAdapter, or press [enter] to skip. (Ex. "2"). Default is 2. - -ADLSAdapter configured. Properties of this ADLSAdapter are: - Hostname: test.dfs.core.windows.net - Root: /example-public-standards - Tenant: 00x000xx-00x0-00xx-00xx-0x0xx000xx00 - ClientId: xxx00x0x-0x00-0000-x0x0-00xxx000xxx0 - Secret: xSDfdzI92d:sd832j8jd@ac823sSglJ - Timeout: PT1S - MaximumTimeout: 5000 - NumberOfRetries: 1 - +Enter a number. List of storage adapters: 1: LocalAdapter 2: CdmStandardsAdapter diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/Input/input.txt b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/Input/input.txt index 56c4bcc442..6847c50033 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/Input/input.txt +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestConfigureAdapters/Input/input.txt @@ -1,4 +1,4 @@ -1 +1 ../../../../../../example-public-standards" 2 yes diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Account.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Account.cdm.json index e9499633f7..e0bac81aaf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Account.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Account.cdm.json @@ -647,6 +647,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountCategoryCode", "contents" : [ "Account/hasAttributes/accountCategoryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountCategoryCode" ] } ] @@ -679,6 +682,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerSizeCode", "contents" : [ "Account/hasAttributes/customerSizeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerSizeCode" ] } ] @@ -711,6 +717,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredContactMethodCode", "contents" : [ "Account/hasAttributes/preferredContactMethodCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredContactMethodCode" ] } ] @@ -743,6 +752,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerTypeCode", "contents" : [ "Account/hasAttributes/customerTypeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerTypeCode" ] } ] @@ -775,6 +787,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountRatingCode", "contents" : [ "Account/hasAttributes/accountRatingCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountRatingCode" ] } ] @@ -807,6 +822,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/industryCode", "contents" : [ "Account/hasAttributes/industryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/industryCode" ] } ] @@ -839,6 +857,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/territoryCode", "contents" : [ "Account/hasAttributes/territoryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/territoryCode" ] } ] @@ -871,6 +892,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountClassificationCode", "contents" : [ "Account/hasAttributes/accountClassificationCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountClassificationCode" ] } ] @@ -903,6 +927,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/businessTypeCode", "contents" : [ "Account/hasAttributes/businessTypeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/businessTypeCode" ] } ] @@ -944,6 +971,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/paymentTermsCode", "contents" : [ "Account/hasAttributes/paymentTermsCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/paymentTermsCode" ] } ] @@ -976,6 +1006,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode", "contents" : [ "Account/hasAttributes/shippingMethodCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/shippingMethodCode" ] } ] @@ -1116,6 +1149,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/ownershipCode", "contents" : [ "Account/hasAttributes/ownershipCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/ownershipCode" ] } ] @@ -1391,6 +1427,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Account/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -1432,6 +1471,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Account/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -1547,7 +1589,7 @@ { "traitReference" : "means.entityState", "arguments" : [ - "resolvedFrom/Account/(resolvedAttributes)/stateCode" + "resolvedFrom/base_Address/Account/(resolvedAttributes)/stateCode" ] } ] @@ -1558,162 +1600,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "customerAddressId", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type" : "attributeDefinition", - "name" : "addressNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type" : "attributeDefinition", - "name" : "objectTypeCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "addressTypeCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "name", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type" : "attributeDefinition", - "name" : "primaryContactName", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type" : "attributeDefinition", - "name" : "line1", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type" : "attributeDefinition", - "name" : "line2", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type" : "attributeDefinition", - "name" : "line3", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type" : "attributeDefinition", - "name" : "city", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type" : "attributeDefinition", - "name" : "stateOrProvince", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type" : "attributeDefinition", - "name" : "county", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type" : "attributeDefinition", - "name" : "country", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type" : "attributeDefinition", - "name" : "postOfficeBox", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type" : "attributeDefinition", - "name" : "postalCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type" : "attributeDefinition", - "name" : "UTCOffset", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type" : "attributeDefinition", - "name" : "freightTermsCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type" : "attributeDefinition", - "name" : "UPSZone", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type" : "attributeDefinition", - "name" : "latitude", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type" : "attributeDefinition", - "name" : "telephone1", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type" : "attributeDefinition", - "name" : "longitude", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type" : "attributeDefinition", - "name" : "shippingMethodCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type" : "attributeDefinition", - "name" : "telephone2", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type" : "attributeDefinition", - "name" : "telephone3", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type" : "attributeDefinition", - "name" : "fax", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type" : "attributeDefinition", - "name" : "versionNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type" : "attributeDefinition", "name" : "User_createdBy", @@ -1728,12 +1614,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "createdOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type" : "attributeDefinition", "name" : "User_modifiedBy", @@ -1748,48 +1628,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "modifiedOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type" : "attributeDefinition", - "name" : "owningBusinessUnit", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type" : "attributeDefinition", - "name" : "owningUser", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type" : "attributeDefinition", - "name" : "timeZoneRuleVersionNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type" : "attributeDefinition", - "name" : "overriddenCreatedOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type" : "attributeDefinition", - "name" : "UTCConversionTimeZoneCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type" : "attributeDefinition", - "name" : "importSequenceNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type" : "attributeDefinition", "name" : "ownerIdAttribute", @@ -1899,18 +1737,6 @@ ] } ] - }, - { - "type" : "attributeDefinition", - "name" : "exchangeRate", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type" : "attributeDefinition", - "name" : "composite", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } @@ -2536,6 +2362,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentDayCode", "contents" : [ "Account/hasAttributes/preferredAppointmentDayCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentDayCode" ] } ] @@ -2605,6 +2434,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentTimeCode", "contents" : [ "Account/hasAttributes/preferredAppointmentTimeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentTimeCode" ] } ] @@ -3348,6 +3180,9 @@ "definition" : "resolvedFrom/base_Account/Account/hasAttributes/attributesAddedAtThisScope/members/accountType", "contents" : [ "Account/hasAttributes/accountType_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountType" ] } ] @@ -3587,6 +3422,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1System", "contents" : [ "Account/hasAttributes/telecom1System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1System" ] } ] @@ -3619,6 +3457,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1Use", "contents" : [ "Account/hasAttributes/telecom1Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1Use" ] } ] @@ -3678,6 +3519,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2System", "contents" : [ "Account/hasAttributes/telecom2System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2System" ] } ] @@ -3710,6 +3554,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2Use", "contents" : [ "Account/hasAttributes/telecom2Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2Use" ] } ] @@ -3769,6 +3616,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3System", "contents" : [ "Account/hasAttributes/telecom3System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3System" ] } ] @@ -3801,6 +3651,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3Use", "contents" : [ "Account/hasAttributes/telecom3Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3Use" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Address.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Address.cdm.json index b2bcc0cbf3..3dbf0663aa 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Address.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Address.cdm.json @@ -81,7 +81,10 @@ "type" : "addedAttributeSupporting", "name" : "supporting_addressTypeCode", "parent" : "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/addressTypeCode/_generatedAttributeSet/_generatedAttributeRound0", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" + "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode", + "lineage" : [ + "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/addressTypeCode" + ] } ] } @@ -223,6 +226,9 @@ "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode", "contents" : [ "Address/hasAttributes/objectTypeCode_display" + ], + "lineage" : [ + "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/objectTypeCode" ] } ] @@ -363,6 +369,9 @@ "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode", "contents" : [ "Address/hasAttributes/freightTermsCode_display" + ], + "lineage" : [ + "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/freightTermsCode" ] } ] @@ -431,6 +440,9 @@ "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode", "contents" : [ "Address/hasAttributes/shippingMethodCode_display" + ], + "lineage" : [ + "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/shippingMethodCode" ] } ] @@ -896,6 +908,7 @@ "Address/hasAttributes/addressTypeCode_display" ], "lineage" : [ + "Address/attributeContext/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/addressTypeCode", "Address/attributeContext/Address/extends/base_Address/Address/attributesAddedAtThisScope/attributesAddedAtThisScope/addressTypeCode/_generatedAttributeSet/_generatedAttributeRound0/supporting_addressTypeCode" ] } diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CarePlan.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CarePlan.cdm.json index 0a6e58840d..9e40a158f7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CarePlan.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CarePlan.cdm.json @@ -590,6 +590,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "CarePlan/hasAttributes/stateCode_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -622,6 +625,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "CarePlan/hasAttributes/statusCode_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -672,6 +678,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/contextType", "contents" : [ "CarePlan/hasAttributes/contextType_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/contextType" ] } ] @@ -902,6 +911,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/planIntent", "contents" : [ "CarePlan/hasAttributes/planIntent_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/planIntent" ] } ] @@ -943,6 +955,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/planStatus", "contents" : [ "CarePlan/hasAttributes/planStatus_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/planStatus" ] } ] @@ -975,6 +990,9 @@ "definition" : "resolvedFrom/CarePlan/hasAttributes/attributesAddedAtThisScope/members/subjectType", "contents" : [ "CarePlan/hasAttributes/subjectType_display" + ], + "lineage" : [ + "CarePlan/attributeContext/CarePlan/attributesAddedAtThisScope/attributesAddedAtThisScope/subjectType" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CodeableConcept.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CodeableConcept.cdm.json index 3df104b4af..63f018fbd3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CodeableConcept.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/CodeableConcept.cdm.json @@ -300,6 +300,9 @@ "definition" : "resolvedFrom/CodeableConcept/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "CodeableConcept/hasAttributes/stateCode_display" + ], + "lineage" : [ + "CodeableConcept/attributeContext/CodeableConcept/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -332,6 +335,9 @@ "definition" : "resolvedFrom/CodeableConcept/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "CodeableConcept/hasAttributes/statusCode_display" + ], + "lineage" : [ + "CodeableConcept/attributeContext/CodeableConcept/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -445,6 +451,9 @@ "definition" : "resolvedFrom/CodeableConcept/hasAttributes/attributesAddedAtThisScope/members/type", "contents" : [ "CodeableConcept/hasAttributes/type_display" + ], + "lineage" : [ + "CodeableConcept/attributeContext/CodeableConcept/attributesAddedAtThisScope/attributesAddedAtThisScope/type" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json index b6e688b270..94a19fecbe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json @@ -634,7 +634,10 @@ "type" : "addedAttributeSupporting", "name" : "supporting_genderCode", "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/genderCode/_generatedAttributeSet/_generatedAttributeRound0", - "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/genderCode" + "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/genderCode", + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/genderCode" + ] } ] } @@ -662,7 +665,10 @@ "type" : "addedAttributeSupporting", "name" : "supporting_familyStatusCode", "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/familyStatusCode/_generatedAttributeSet/_generatedAttributeRound0", - "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/familyStatusCode" + "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/familyStatusCode", + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/familyStatusCode" + ] } ] } @@ -703,6 +709,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/customerSizeCode", "contents" : [ "Contact/hasAttributes/customerSizeCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/customerSizeCode" ] } ] @@ -735,6 +744,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/customerTypeCode", "contents" : [ "Contact/hasAttributes/customerTypeCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/customerTypeCode" ] } ] @@ -767,6 +779,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/preferredContactMethodCode", "contents" : [ "Contact/hasAttributes/preferredContactMethodCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredContactMethodCode" ] } ] @@ -799,6 +814,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/leadSourceCode", "contents" : [ "Contact/hasAttributes/leadSourceCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/leadSourceCode" ] } ] @@ -831,6 +849,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/paymentTermsCode", "contents" : [ "Contact/hasAttributes/paymentTermsCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/paymentTermsCode" ] } ] @@ -863,6 +884,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode", "contents" : [ "Contact/hasAttributes/shippingMethodCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/shippingMethodCode" ] } ] @@ -1093,6 +1117,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/hasChildrenCode", "contents" : [ "Contact/hasAttributes/hasChildrenCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/hasChildrenCode" ] } ] @@ -1125,6 +1152,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/educationCode", "contents" : [ "Contact/hasAttributes/educationCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/educationCode" ] } ] @@ -1301,6 +1331,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/accountRoleCode", "contents" : [ "Contact/hasAttributes/accountRoleCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/accountRoleCode" ] } ] @@ -1333,6 +1366,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/territoryCode", "contents" : [ "Contact/hasAttributes/territoryCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/territoryCode" ] } ] @@ -1464,6 +1500,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Contact/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -1505,6 +1544,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Contact/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -1640,162 +1682,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "customerAddressId", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type" : "attributeDefinition", - "name" : "addressNumber", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type" : "attributeDefinition", - "name" : "objectTypeCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "addressTypeCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "name", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type" : "attributeDefinition", - "name" : "primaryContactName", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type" : "attributeDefinition", - "name" : "line1", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type" : "attributeDefinition", - "name" : "line2", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type" : "attributeDefinition", - "name" : "line3", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type" : "attributeDefinition", - "name" : "city", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type" : "attributeDefinition", - "name" : "stateOrProvince", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type" : "attributeDefinition", - "name" : "county", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type" : "attributeDefinition", - "name" : "country", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type" : "attributeDefinition", - "name" : "postOfficeBox", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type" : "attributeDefinition", - "name" : "postalCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type" : "attributeDefinition", - "name" : "UTCOffset", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type" : "attributeDefinition", - "name" : "freightTermsCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type" : "attributeDefinition", - "name" : "UPSZone", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type" : "attributeDefinition", - "name" : "latitude", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type" : "attributeDefinition", - "name" : "telephone1", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type" : "attributeDefinition", - "name" : "longitude", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type" : "attributeDefinition", - "name" : "shippingMethodCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type" : "attributeDefinition", - "name" : "telephone2", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type" : "attributeDefinition", - "name" : "telephone3", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type" : "attributeDefinition", - "name" : "fax", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type" : "attributeDefinition", - "name" : "versionNumber", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type" : "attributeDefinition", "name" : "User_createdBy", @@ -1810,12 +1696,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "createdOn", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type" : "attributeDefinition", "name" : "User_modifiedBy", @@ -1830,48 +1710,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "modifiedOn", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type" : "attributeDefinition", - "name" : "owningBusinessUnit", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type" : "attributeDefinition", - "name" : "owningUser", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type" : "attributeDefinition", - "name" : "timeZoneRuleVersionNumber", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type" : "attributeDefinition", - "name" : "overriddenCreatedOn", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type" : "attributeDefinition", - "name" : "UTCConversionTimeZoneCode", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type" : "attributeDefinition", - "name" : "importSequenceNumber", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type" : "attributeDefinition", "name" : "ownerIdAttribute", @@ -1981,18 +1819,6 @@ ] } ] - }, - { - "type" : "attributeDefinition", - "name" : "exchangeRate", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type" : "attributeDefinition", - "name" : "composite", - "parent" : "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } @@ -3031,6 +2857,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentDayCode", "contents" : [ "Contact/hasAttributes/preferredAppointmentDayCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentDayCode" ] } ] @@ -3063,6 +2892,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentTimeCode", "contents" : [ "Contact/hasAttributes/preferredAppointmentTimeCode_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentTimeCode" ] } ] @@ -3773,6 +3605,7 @@ "Contact/hasAttributes/genderCode_display" ], "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/genderCode", "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/genderCode/_generatedAttributeSet/_generatedAttributeRound0/supporting_genderCode" ] } @@ -3811,6 +3644,7 @@ "Contact/hasAttributes/familyStatusCode_display" ], "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/familyStatusCode", "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/familyStatusCode/_generatedAttributeSet/_generatedAttributeRound0/supporting_familyStatusCode" ] } @@ -4378,6 +4212,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/contactType", "contents" : [ "Contact/hasAttributes/contactType_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/contactType" ] } ] @@ -4725,6 +4562,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/name1Use", "contents" : [ "Contact/hasAttributes/name1Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/name1Use" ] } ] @@ -4820,6 +4660,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/name2Use", "contents" : [ "Contact/hasAttributes/name2Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/name2Use" ] } ] @@ -4915,6 +4758,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/name3Use", "contents" : [ "Contact/hasAttributes/name3Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/name3Use" ] } ] @@ -5046,6 +4892,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom1System", "contents" : [ "Contact/hasAttributes/telecom1System_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1System" ] } ] @@ -5078,6 +4927,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom1Use", "contents" : [ "Contact/hasAttributes/telecom1Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1Use" ] } ] @@ -5137,6 +4989,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom2System", "contents" : [ "Contact/hasAttributes/telecom2System_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2System" ] } ] @@ -5169,6 +5024,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom2Use", "contents" : [ "Contact/hasAttributes/telecom2Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2Use" ] } ] @@ -5228,6 +5086,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom3System", "contents" : [ "Contact/hasAttributes/telecom3System_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3System" ] } ] @@ -5260,6 +5121,9 @@ "definition" : "resolvedFrom/Contact/hasAttributes/attributesAddedAtThisScope/members/telecom3Use", "contents" : [ "Contact/hasAttributes/telecom3Use_display" + ], + "lineage" : [ + "Contact/attributeContext/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3Use" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Device.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Device.cdm.json index 43d168c09d..dabaeac352 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Device.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Device.cdm.json @@ -590,6 +590,9 @@ "definition" : "resolvedFrom/Device/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Device/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Device/attributeContext/Device/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -622,6 +625,9 @@ "definition" : "resolvedFrom/Device/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Device/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Device/attributeContext/Device/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -681,6 +687,9 @@ "definition" : "resolvedFrom/Device/hasAttributes/attributesAddedAtThisScope/members/deviceStatus", "contents" : [ "Device/hasAttributes/deviceStatus_display" + ], + "lineage" : [ + "Device/attributeContext/Device/attributesAddedAtThisScope/attributesAddedAtThisScope/deviceStatus" ] } ] @@ -956,6 +965,9 @@ "definition" : "resolvedFrom/Device/hasAttributes/attributesAddedAtThisScope/members/UDIEntryType", "contents" : [ "Device/hasAttributes/UDIEntryType_display" + ], + "lineage" : [ + "Device/attributeContext/Device/attributesAddedAtThisScope/attributesAddedAtThisScope/UDIEntryType" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json index 01833a8ff3..90fef86d90 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json @@ -659,6 +659,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/activityTypeCode", "contents" : [ "EmrAppointment/hasAttributes/activityTypeCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/activityTypeCode" ] } ] @@ -691,6 +694,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "EmrAppointment/hasAttributes/stateCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -750,6 +756,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "EmrAppointment/hasAttributes/statusCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -791,6 +800,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/priorityCode", "contents" : [ "EmrAppointment/hasAttributes/priorityCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/priorityCode" ] } ] @@ -1281,6 +1293,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/instanceTypeCode", "contents" : [ "EmrAppointment/hasAttributes/instanceTypeCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/instanceTypeCode" ] } ] @@ -1394,6 +1409,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/community", "contents" : [ "EmrAppointment/hasAttributes/community_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/community" ] } ] @@ -1462,6 +1480,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/deliveryPriorityCode", "contents" : [ "EmrAppointment/hasAttributes/deliveryPriorityCode_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/deliveryPriorityCode" ] } ] @@ -2080,6 +2101,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/participantActorType", "contents" : [ "EmrAppointment/hasAttributes/participantActorType_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/participantActorType" ] } ] @@ -2112,6 +2136,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/participantStatus", "contents" : [ "EmrAppointment/hasAttributes/participantStatus_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/participantStatus" ] } ] @@ -2207,6 +2234,9 @@ "definition" : "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/required", "contents" : [ "EmrAppointment/hasAttributes/required_display" + ], + "lineage" : [ + "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/required" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Encounter.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Encounter.cdm.json index 78d568797b..25055280b4 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Encounter.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Encounter.cdm.json @@ -590,6 +590,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Encounter/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -622,6 +625,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Encounter/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -708,6 +714,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/class", "contents" : [ "Encounter/hasAttributes/class_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/class" ] } ] @@ -839,6 +848,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/encounterClass", "contents" : [ "Encounter/hasAttributes/encounterClass_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/encounterClass" ] } ] @@ -1087,6 +1099,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/encounterStatus", "contents" : [ "Encounter/hasAttributes/encounterStatus_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/encounterStatus" ] } ] @@ -1416,6 +1431,9 @@ "definition" : "resolvedFrom/Encounter/hasAttributes/attributesAddedAtThisScope/members/priority", "contents" : [ "Encounter/hasAttributes/priority_display" + ], + "lineage" : [ + "Encounter/attributeContext/Encounter/attributesAddedAtThisScope/attributesAddedAtThisScope/priority" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EpisodeOfCare.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EpisodeOfCare.cdm.json index 34d57d7a0f..3c44c7bbfd 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EpisodeOfCare.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/EpisodeOfCare.cdm.json @@ -590,6 +590,9 @@ "definition" : "resolvedFrom/EpisodeOfCare/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "EpisodeOfCare/hasAttributes/stateCode_display" + ], + "lineage" : [ + "EpisodeOfCare/attributeContext/EpisodeOfCare/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -622,6 +625,9 @@ "definition" : "resolvedFrom/EpisodeOfCare/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "EpisodeOfCare/hasAttributes/statusCode_display" + ], + "lineage" : [ + "EpisodeOfCare/attributeContext/EpisodeOfCare/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -825,6 +831,9 @@ "definition" : "resolvedFrom/EpisodeOfCare/hasAttributes/attributesAddedAtThisScope/members/status", "contents" : [ "EpisodeOfCare/hasAttributes/status_display" + ], + "lineage" : [ + "EpisodeOfCare/attributeContext/EpisodeOfCare/attributesAddedAtThisScope/attributesAddedAtThisScope/status" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Location.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Location.cdm.json index dec288e298..e81b5cfaf3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Location.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateManifest/ExpectedOutput/Location.cdm.json @@ -300,6 +300,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Location/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -332,6 +335,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Location/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -517,6 +523,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/addressType", "contents" : [ "Location/hasAttributes/addressType_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/addressType" ] } ] @@ -549,6 +558,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/addressUse", "contents" : [ "Location/hasAttributes/addressUse_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/addressUse" ] } ] @@ -698,6 +710,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/mode", "contents" : [ "Location/hasAttributes/mode_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/mode" ] } ] @@ -730,6 +745,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/operationalStatus", "contents" : [ "Location/hasAttributes/operationalStatus_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/operationalStatus" ] } ] @@ -852,6 +870,9 @@ "definition" : "resolvedFrom/Location/hasAttributes/attributesAddedAtThisScope/members/status", "contents" : [ "Location/hasAttributes/status_display" + ], + "lineage" : [ + "Location/attributeContext/Location/attributesAddedAtThisScope/attributesAddedAtThisScope/status" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json index aea10af836..e0f794aeec 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCreateNetNewEntities/ExpectedOutput/resolved/ExtendedStandardAccount.cdm.json @@ -666,6 +666,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountCategoryCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/accountCategoryCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountCategoryCode" ] } ] @@ -698,6 +701,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerSizeCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/customerSizeCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerSizeCode" ] } ] @@ -730,6 +736,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredContactMethodCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/preferredContactMethodCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredContactMethodCode" ] } ] @@ -762,6 +771,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerTypeCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/customerTypeCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerTypeCode" ] } ] @@ -794,6 +806,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountRatingCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/accountRatingCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountRatingCode" ] } ] @@ -826,6 +841,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/industryCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/industryCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/industryCode" ] } ] @@ -858,6 +876,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/territoryCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/territoryCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/territoryCode" ] } ] @@ -890,6 +911,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountClassificationCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/accountClassificationCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountClassificationCode" ] } ] @@ -922,6 +946,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/businessTypeCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/businessTypeCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/businessTypeCode" ] } ] @@ -963,6 +990,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/paymentTermsCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/paymentTermsCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/paymentTermsCode" ] } ] @@ -995,6 +1025,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/shippingMethodCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/shippingMethodCode" ] } ] @@ -1135,6 +1168,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/ownershipCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/ownershipCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/ownershipCode" ] } ] @@ -1410,6 +1446,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/stateCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -1451,6 +1490,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/statusCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -1577,162 +1619,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "customerAddressId", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type" : "attributeDefinition", - "name" : "addressNumber", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type" : "attributeDefinition", - "name" : "objectTypeCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "addressTypeCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "name", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type" : "attributeDefinition", - "name" : "primaryContactName", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type" : "attributeDefinition", - "name" : "line1", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type" : "attributeDefinition", - "name" : "line2", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type" : "attributeDefinition", - "name" : "line3", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type" : "attributeDefinition", - "name" : "city", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type" : "attributeDefinition", - "name" : "stateOrProvince", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type" : "attributeDefinition", - "name" : "county", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type" : "attributeDefinition", - "name" : "country", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type" : "attributeDefinition", - "name" : "postOfficeBox", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type" : "attributeDefinition", - "name" : "postalCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type" : "attributeDefinition", - "name" : "UTCOffset", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type" : "attributeDefinition", - "name" : "freightTermsCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type" : "attributeDefinition", - "name" : "UPSZone", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type" : "attributeDefinition", - "name" : "latitude", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type" : "attributeDefinition", - "name" : "telephone1", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type" : "attributeDefinition", - "name" : "longitude", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type" : "attributeDefinition", - "name" : "shippingMethodCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type" : "attributeDefinition", - "name" : "telephone2", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type" : "attributeDefinition", - "name" : "telephone3", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type" : "attributeDefinition", - "name" : "fax", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type" : "attributeDefinition", - "name" : "versionNumber", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type" : "attributeDefinition", "name" : "User_createdBy", @@ -1747,12 +1633,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "createdOn", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type" : "attributeDefinition", "name" : "User_modifiedBy", @@ -1767,48 +1647,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "modifiedOn", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type" : "attributeDefinition", - "name" : "owningBusinessUnit", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type" : "attributeDefinition", - "name" : "owningUser", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type" : "attributeDefinition", - "name" : "timeZoneRuleVersionNumber", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type" : "attributeDefinition", - "name" : "overriddenCreatedOn", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type" : "attributeDefinition", - "name" : "UTCConversionTimeZoneCode", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type" : "attributeDefinition", - "name" : "importSequenceNumber", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type" : "attributeDefinition", "name" : "ownerIdAttribute", @@ -1918,18 +1756,6 @@ ] } ] - }, - { - "type" : "attributeDefinition", - "name" : "exchangeRate", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type" : "attributeDefinition", - "name" : "composite", - "parent" : "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } @@ -2555,6 +2381,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentDayCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/preferredAppointmentDayCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentDayCode" ] } ] @@ -2624,6 +2453,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentTimeCode", "contents" : [ "ExtendedStandardAccount/hasAttributes/preferredAppointmentTimeCode_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentTimeCode" ] } ] @@ -3367,6 +3199,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountType", "contents" : [ "ExtendedStandardAccount/hasAttributes/accountType_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountType" ] } ] @@ -3606,6 +3441,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1System", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom1System_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1System" ] } ] @@ -3638,6 +3476,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1Use", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom1Use_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1Use" ] } ] @@ -3697,6 +3538,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2System", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom2System_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2System" ] } ] @@ -3729,6 +3573,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2Use", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom2Use_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2Use" ] } ] @@ -3788,6 +3635,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3System", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom3System_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3System" ] } ] @@ -3820,6 +3670,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3Use", "contents" : [ "ExtendedStandardAccount/hasAttributes/telecom3Use_display" + ], + "lineage" : [ + "ExtendedStandardAccount/attributeContext/ExtendedStandardAccount/extends/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3Use" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCustomizeEntities/ExpectedOutput/LocalMobileCareTeam.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCustomizeEntities/ExpectedOutput/LocalMobileCareTeam.cdm.json index 5889f2ef25..ae873eb7fe 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCustomizeEntities/ExpectedOutput/LocalMobileCareTeam.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestCustomizeEntities/ExpectedOutput/LocalMobileCareTeam.cdm.json @@ -609,6 +609,9 @@ "definition" : "resolvedFrom/CareTeam/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "LocalMobileCareTeam/hasAttributes/stateCode_display" + ], + "lineage" : [ + "LocalMobileCareTeam/attributeContext/LocalMobileCareTeam/extends/CareTeam/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -641,6 +644,9 @@ "definition" : "resolvedFrom/CareTeam/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "LocalMobileCareTeam/hasAttributes/statusCode_display" + ], + "lineage" : [ + "LocalMobileCareTeam/attributeContext/LocalMobileCareTeam/extends/CareTeam/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -700,6 +706,9 @@ "definition" : "resolvedFrom/CareTeam/hasAttributes/attributesAddedAtThisScope/members/careTeamStatus", "contents" : [ "LocalMobileCareTeam/hasAttributes/careTeamStatus_display" + ], + "lineage" : [ + "LocalMobileCareTeam/attributeContext/LocalMobileCareTeam/extends/CareTeam/attributesAddedAtThisScope/attributesAddedAtThisScope/careTeamStatus" ] } ] @@ -732,6 +741,9 @@ "definition" : "resolvedFrom/CareTeam/hasAttributes/attributesAddedAtThisScope/members/contextType", "contents" : [ "LocalMobileCareTeam/hasAttributes/contextType_display" + ], + "lineage" : [ + "LocalMobileCareTeam/attributeContext/LocalMobileCareTeam/extends/CareTeam/attributesAddedAtThisScope/attributesAddedAtThisScope/contextType" ] } ] @@ -962,6 +974,9 @@ "definition" : "resolvedFrom/CareTeam/hasAttributes/attributesAddedAtThisScope/members/subjectType", "contents" : [ "LocalMobileCareTeam/hasAttributes/subjectType_display" + ], + "lineage" : [ + "LocalMobileCareTeam/attributeContext/LocalMobileCareTeam/extends/CareTeam/attributesAddedAtThisScope/attributesAddedAtThisScope/subjectType" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json index 4dd9c40ea9..57a979652f 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json @@ -75,33 +75,7 @@ "type" : "entity", "name" : "Address", "parent" : "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source", - "definition" : "resolvedFrom/Address", - "contents" : [ - { - "type" : "attributeDefinition", - "name" : "addressLine", - "parent" : "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition" : "resolvedFrom/Address/hasAttributes/addressLine" - }, - { - "type" : "attributeDefinition", - "name" : "postalCode", - "parent" : "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition" : "resolvedFrom/Address/hasAttributes/postalCode" - }, - { - "type" : "attributeDefinition", - "name" : "city", - "parent" : "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition" : "resolvedFrom/Address/hasAttributes/city" - }, - { - "type" : "attributeDefinition", - "name" : "country", - "parent" : "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition" : "resolvedFrom/Address/hasAttributes/country" - } - ] + "definition" : "resolvedFrom/Address" } ] } diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Account.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Account.cdm.json index 63488b9519..431cb12995 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Account.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Account.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Account.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Address.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Address.cdm.json index 113beba149..db2d8fef8c 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Address.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Address.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Address.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CarePlan.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CarePlan.cdm.json index 08354bce36..554eb609b8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CarePlan.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CarePlan.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/CarePlan.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CodeableConcept.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CodeableConcept.cdm.json index 6f5211a13d..46f6827a41 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CodeableConcept.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/CodeableConcept.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/CodeableConcept.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Contact.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Contact.cdm.json index 40c33667d0..5d66a375a0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Contact.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Contact.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Contact.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Device.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Device.cdm.json index f2edca68db..7c3a54d8ec 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Device.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Device.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Device.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EmrAppointment.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EmrAppointment.cdm.json index b94f579393..aeeb895ab8 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EmrAppointment.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EmrAppointment.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/EmrAppointment.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Encounter.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Encounter.cdm.json index 9e93e63ccd..abd2d99575 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Encounter.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Encounter.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Encounter.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EpisodeOfCare.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EpisodeOfCare.cdm.json index f54bf71bf2..4df4b2a8c0 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EpisodeOfCare.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/EpisodeOfCare.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/EpisodeOfCare.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/LocalMobileCareTeam.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/LocalMobileCareTeam.cdm.json index 60294beb60..3d53c592d9 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/LocalMobileCareTeam.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/LocalMobileCareTeam.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "local:/MobileCareTeam.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Location.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Location.cdm.json index 4d5b365959..8ab356bcd3 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Location.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/Location.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/Location.cdm.json", diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/MobileCareTeam.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/MobileCareTeam.cdm.json index 2bd5182b02..5abcc5bbe7 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/MobileCareTeam.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/MobileCareTeam.cdm.json @@ -1,5 +1,5 @@ { - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/core/applicationCommon/foundationCommon/crmCommon/accelerators/healthCare/electronicMedicalRecords/CareTeam.cdm.json" diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/default.manifest.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/default.manifest.cdm.json index e8d0987253..c3128b25ac 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/default.manifest.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestReadManifest/Input/default.manifest.cdm.json @@ -694,7 +694,7 @@ "toEntityAttribute": "locationId" } ], - "jsonSchemaSemanticVersion": "1.1.0", + "jsonSchemaSemanticVersion": "1.0.0", "imports": [ { "corpusPath": "cdm:/foundations.cdm.json" diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json index a24f22274a..e0bac81aaf 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/testdata/samples/TestSearchPartitionPattern/ExpectedOutput/resolved/Account.cdm.json @@ -647,6 +647,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountCategoryCode", "contents" : [ "Account/hasAttributes/accountCategoryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountCategoryCode" ] } ] @@ -679,6 +682,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerSizeCode", "contents" : [ "Account/hasAttributes/customerSizeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerSizeCode" ] } ] @@ -711,6 +717,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredContactMethodCode", "contents" : [ "Account/hasAttributes/preferredContactMethodCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredContactMethodCode" ] } ] @@ -743,6 +752,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/customerTypeCode", "contents" : [ "Account/hasAttributes/customerTypeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/customerTypeCode" ] } ] @@ -775,6 +787,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountRatingCode", "contents" : [ "Account/hasAttributes/accountRatingCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountRatingCode" ] } ] @@ -807,6 +822,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/industryCode", "contents" : [ "Account/hasAttributes/industryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/industryCode" ] } ] @@ -839,6 +857,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/territoryCode", "contents" : [ "Account/hasAttributes/territoryCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/territoryCode" ] } ] @@ -871,6 +892,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/accountClassificationCode", "contents" : [ "Account/hasAttributes/accountClassificationCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountClassificationCode" ] } ] @@ -903,6 +927,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/businessTypeCode", "contents" : [ "Account/hasAttributes/businessTypeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/businessTypeCode" ] } ] @@ -944,6 +971,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/paymentTermsCode", "contents" : [ "Account/hasAttributes/paymentTermsCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/paymentTermsCode" ] } ] @@ -976,6 +1006,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode", "contents" : [ "Account/hasAttributes/shippingMethodCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/shippingMethodCode" ] } ] @@ -1116,6 +1149,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/ownershipCode", "contents" : [ "Account/hasAttributes/ownershipCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/ownershipCode" ] } ] @@ -1391,6 +1427,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/stateCode", "contents" : [ "Account/hasAttributes/stateCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/stateCode" ] } ] @@ -1432,6 +1471,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/statusCode", "contents" : [ "Account/hasAttributes/statusCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/statusCode" ] } ] @@ -1558,162 +1600,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "customerAddressId", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type" : "attributeDefinition", - "name" : "addressNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type" : "attributeDefinition", - "name" : "objectTypeCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "addressTypeCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type" : "attributeDefinition", - "name" : "name", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type" : "attributeDefinition", - "name" : "primaryContactName", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type" : "attributeDefinition", - "name" : "line1", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type" : "attributeDefinition", - "name" : "line2", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type" : "attributeDefinition", - "name" : "line3", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type" : "attributeDefinition", - "name" : "city", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type" : "attributeDefinition", - "name" : "stateOrProvince", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type" : "attributeDefinition", - "name" : "county", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type" : "attributeDefinition", - "name" : "country", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type" : "attributeDefinition", - "name" : "postOfficeBox", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type" : "attributeDefinition", - "name" : "postalCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type" : "attributeDefinition", - "name" : "UTCOffset", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type" : "attributeDefinition", - "name" : "freightTermsCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type" : "attributeDefinition", - "name" : "UPSZone", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type" : "attributeDefinition", - "name" : "latitude", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type" : "attributeDefinition", - "name" : "telephone1", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type" : "attributeDefinition", - "name" : "longitude", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type" : "attributeDefinition", - "name" : "shippingMethodCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type" : "attributeDefinition", - "name" : "telephone2", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type" : "attributeDefinition", - "name" : "telephone3", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type" : "attributeDefinition", - "name" : "fax", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type" : "attributeDefinition", - "name" : "versionNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type" : "attributeDefinition", "name" : "User_createdBy", @@ -1728,12 +1614,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "createdOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type" : "attributeDefinition", "name" : "User_modifiedBy", @@ -1748,48 +1628,6 @@ } ] }, - { - "type" : "attributeDefinition", - "name" : "modifiedOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type" : "attributeDefinition", - "name" : "owningBusinessUnit", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type" : "attributeDefinition", - "name" : "owningUser", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type" : "attributeDefinition", - "name" : "timeZoneRuleVersionNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type" : "attributeDefinition", - "name" : "overriddenCreatedOn", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type" : "attributeDefinition", - "name" : "UTCConversionTimeZoneCode", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type" : "attributeDefinition", - "name" : "importSequenceNumber", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type" : "attributeDefinition", "name" : "ownerIdAttribute", @@ -1899,18 +1737,6 @@ ] } ] - }, - { - "type" : "attributeDefinition", - "name" : "exchangeRate", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type" : "attributeDefinition", - "name" : "composite", - "parent" : "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition" : "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } @@ -2536,6 +2362,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentDayCode", "contents" : [ "Account/hasAttributes/preferredAppointmentDayCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentDayCode" ] } ] @@ -2605,6 +2434,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/preferredAppointmentTimeCode", "contents" : [ "Account/hasAttributes/preferredAppointmentTimeCode_display" + ], + "lineage" : [ + "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/preferredAppointmentTimeCode" ] } ] @@ -3348,6 +3180,9 @@ "definition" : "resolvedFrom/base_Account/Account/hasAttributes/attributesAddedAtThisScope/members/accountType", "contents" : [ "Account/hasAttributes/accountType_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/accountType" ] } ] @@ -3587,6 +3422,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1System", "contents" : [ "Account/hasAttributes/telecom1System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1System" ] } ] @@ -3619,6 +3457,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom1Use", "contents" : [ "Account/hasAttributes/telecom1Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom1Use" ] } ] @@ -3678,6 +3519,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2System", "contents" : [ "Account/hasAttributes/telecom2System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2System" ] } ] @@ -3710,6 +3554,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom2Use", "contents" : [ "Account/hasAttributes/telecom2Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom2Use" ] } ] @@ -3769,6 +3616,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3System", "contents" : [ "Account/hasAttributes/telecom3System_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3System" ] } ] @@ -3801,6 +3651,9 @@ "definition" : "resolvedFrom/Account/hasAttributes/attributesAddedAtThisScope/members/telecom3Use", "contents" : [ "Account/hasAttributes/telecom3Use_display" + ], + "lineage" : [ + "Account/attributeContext/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/telecom3Use" ] } ] diff --git a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/utilities/ProjectionTestUtils.java b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/utilities/ProjectionTestUtils.java index f5fd1c776b..315accf190 100644 --- a/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/utilities/ProjectionTestUtils.java +++ b/objectModel/Java/objectmodel/src/test/java/com/microsoft/commondatamodel/objectmodel/utilities/ProjectionTestUtils.java @@ -7,8 +7,11 @@ import com.microsoft.commondatamodel.objectmodel.cdm.*; import com.microsoft.commondatamodel.objectmodel.cdm.projection.AttributeContextUtil; import com.microsoft.commondatamodel.objectmodel.cdm.projections.CdmProjection; +import com.microsoft.commondatamodel.objectmodel.enums.CdmLogCode; import com.microsoft.commondatamodel.objectmodel.enums.CdmObjectType; import com.microsoft.commondatamodel.objectmodel.enums.CdmStatusLevel; +import com.microsoft.commondatamodel.objectmodel.utilities.logger.EventList; + import org.testng.Assert; import java.io.BufferedWriter; @@ -19,8 +22,10 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; /** @@ -35,6 +40,13 @@ public class ProjectionTestUtils { */ private static final String foundationJsonPath = "cdm:/foundations.cdm.json"; + /** + * The log codes that are allowed to be logged without failing the test + */ + private static HashSet allowedLogs = new HashSet<>( + Arrays.asList(CdmLogCode.WarnDeprecatedResolutionGuidance.name()) + ); + /** * Resolves an entity * @param corpus The corpus @@ -184,7 +196,11 @@ public static CdmCorpusDefinition getLocalCorpus(final String testsSubpath, fina CdmCorpusDefinition corpus = TestHelper.getLocalCorpus(testsSubpath, testName, null); corpus.setEventCallback((CdmStatusLevel level, String message) -> { - Assert.fail(message); + EventList events = corpus.getCtx().getEvents(); + Map lastEvent = events.get(events.size() - 1); + if (!lastEvent.containsKey("code") || !allowedLogs.contains(lastEvent.get("code"))) { + Assert.fail(message); + } }, CdmStatusLevel.Warning); return corpus; diff --git a/objectModel/Java/pom.xml b/objectModel/Java/pom.xml index 8da39fd258..43c89ac49e 100644 --- a/objectModel/Java/pom.xml +++ b/objectModel/Java/pom.xml @@ -5,7 +5,7 @@ - 1.2.1 + 1.2.2 com.microsoft.commondatamodel diff --git a/objectModel/Python/cdm/enums/cdm_log_code.py b/objectModel/Python/cdm/enums/cdm_log_code.py index 13327105e2..20760427bd 100644 --- a/objectModel/Python/cdm/enums/cdm_log_code.py +++ b/objectModel/Python/cdm/enums/cdm_log_code.py @@ -126,6 +126,7 @@ class CdmLogCode(AutoNumber): ERR_REL_UNDEFINED = () # Warnings WARN_PARTITION_GLOB_AND_REGEX_PRESENT = () + WARN_DEPRECATED_RESOLUTION_GUIDANCE = () WARN_DOC_CHANGES_DISCARDED = () WARN_DOC_IMPORT_NOT_LOADED = () WARN_PARTITION_FILE_FETCH_FAILED = () diff --git a/objectModel/Python/cdm/objectmodel/cdm_attribute_context.py b/objectModel/Python/cdm/objectmodel/cdm_attribute_context.py index 35abc1ca15..c4f6799a48 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_attribute_context.py +++ b/objectModel/Python/cdm/objectmodel/cdm_attribute_context.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. -from typing import cast, List, Optional, Union, TYPE_CHECKING +from typing import cast, List, Optional, Set, Union, TYPE_CHECKING from collections import OrderedDict from cdm.enums import CdmLogCode @@ -174,14 +174,12 @@ def _add_lineage(self, obj_lineage: 'CdmObject', validate: Optional[bool] = True return None self.lineage.append(ref_lineage) - # debugging. get the parent of the context tree and validate that this node is in that tree (Ported from C# written by Jeff) - # if (validate == true) - # { - # CdmAttributeContext trace = refLineage.ExplicitReference as CdmAttributeContext; - # while (trace.Parent != null) - # trace = trace.Parent.ExplicitReference as CdmAttributeContext; - # trace.ValidateLineage(null); - # } + # debugging. get the parent of the context tree and validate that this node is in that tree + # if validate: + # trace = refLineage.explicit_reference # type: CdmAttributeContext + # while trace.parent: + # trace = trace.parent.explicit_reference # type: CdmAttributeContext + # trace.validate_lineage(null) return ref_lineage @@ -190,11 +188,9 @@ def prepare_options_for_resolve_attributes(res_opt_source: ResolveOptions) -> Re res_opt_copy = res_opt_source.copy() # use this whenever we need to keep references pointing at things that were already found. used when 'fixing' references by localizing to a new document res_opt_copy._save_resolutions_on_copy = True - # for debugging help (Ported from C# written by Jeff) - # if (resOptCopy.MapOldCtxToNewCtx != null) - # { - # return null; - # } + # for debugging help + # if resOptCopy.map_old_ctx_to_new_ctx: + # return None res_opt_copy._map_old_ctx_to_new_ctx = OrderedDict() # Type: Dict['CdmAttributeContext', 'CdmAttributeContext'] return res_opt_copy @@ -360,6 +356,149 @@ def _fix_att_ctx_node_lineage(sub_item) -> None: return True + def _collect_context_from_atts(self, ras_sub: ResolvedAttributeSet, collected: Set['CdmAttributeContext']) -> None: + for ra in ras_sub._set: + ra_ctx = ra.att_ctx + collected.add(ra_ctx) + + # the target for a resolved att can be a TypeAttribute OR it can be another ResolvedAttributeSet (meaning a group) + if isinstance(ra.target, ResolvedAttributeSet): + # a group + self._collect_context_from_atts(ra.target, collected) + + def _prune_to_scope(self, scope_set: Set['CdmAttributeContext']) -> bool: + # run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set + # (so base entity chains, entity attributes entity definitions) + + # for testing, don't delete this + # def count_nodes(sub_item) -> int: + # if not isinstance(sub_item, CdmAttributeContext): + # return 1 + # ac = sub_item # type: CdmAttributeContext + # if not ac.contents: + # return 1 + # # look at all children + # total = 0 + # for sub_sub in ac.contents: + # total += count_nodes(sub_sub) + # return 1 + total + # print('Pre Prune', count_nodes(self)) + + + # so ... the change from the old behavior is to depend on the lineage pointers to save the attribute defs + # in the 'structure' part of the tree that might matter. keep all of the other structure info and keep some + # special nodes (like the ones that have removed attributes) that won't get found from lineage trace but that are + # needed to understand what took place in resolution + nodes_to_save = set() + + # helper that save the passed node and anything up the parent chain + def save_parent_nodes(curr_node) -> bool: + if curr_node in nodes_to_save: + return True + nodes_to_save.add(curr_node) + # get the parent + if curr_node.parent and curr_node.parent.explicit_reference: + return save_parent_nodes(curr_node.parent.explicit_reference) + return True + + # helper that saves the current node (and parents) plus anything in the lineage (with their parents) + def save_lineage_nodes(curr_node) -> bool: + if not save_parent_nodes(curr_node): + return False + + if curr_node.lineage: + for lin in curr_node.lineage: + if lin.explicit_reference: + if not save_lineage_nodes(lin.explicit_reference): + return False + return True + + def save_structure_nodes(sub_item, in_generated, in_projection, in_remove) -> bool: + if not isinstance(sub_item, CdmAttributeContext): + return True + + ac = sub_item # type: CdmAttributeContext + if ac.type == CdmAttributeContextType.GENERATED_SET: + in_generated = True # special mode where we hate everything except the removed att notes + + if in_generated and (ac.type == CdmAttributeContextType.OPERATION_EXCLUDE_ATTRIBUTES or ac.type == CdmAttributeContextType.OPERATION_INCLUDE_ATTRIBUTES): + in_remove = True # triggers us to know what to do in the next code block. + removed_attribute = False + if ac.type == CdmAttributeContextType.ATTRIBUTE_DEFINITION: + # empty attribute nodes are descriptions of source attributes that may or may not be needed. lineage will sort it out. + # the exception is for attribute descriptions under a remove attributes operation. they are gone from the resolved att set, so + # no history would remain + if in_remove: + removed_attribute = True + else: + if ac.contents is None or len(ac.contents) == 0: + return True + + if not in_generated or removed_attribute: + # mark this as something worth saving, sometimes + # these get discovered at the leaf of a tree that we want to mostly ignore, so can cause a + # discontinuity in the 'save' chains, so fix that + save_lineage_nodes(ac) + + if ac.type == CdmAttributeContextType.PROJECTION: + in_projection = True # track this so we can do the next thing ... + + if ac.type == CdmAttributeContextType.ENTITY and in_projection: + # this is far enough, the entity that is somewhere under a projection chain + # things under this might get saved through lineage, but down to this point will get in for sure + return True + + if ac.contents is None or len(ac.contents) == 0: + return True + + # look at all children + for sub_sub in ac.contents: + if not save_structure_nodes(sub_sub, in_generated, in_projection, in_remove): + return False + return True + + if not save_structure_nodes(self, False, False, False): + return False + + # next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save + # also mark any parents of those as savers + + + # so, do that ^^^ for every primary context found earlier + for prim_ctx in scope_set: + if not save_lineage_nodes(prim_ctx): + return False + + # now the cleanup, we have a set of the nodes that should be saved + # run over the tree and re-build the contents collection with only the things to save + def clean_sub_group(sub_item) -> bool: + if sub_item.object_type == CdmObjectType.ATTRIBUTE_REF: + return True # not empty + + ac = sub_item # type: CdmAttributeContext + + if ac not in nodes_to_save: + return False # don't even look at content, this all goes away + + if ac.contents: + # need to clean up the content array without triggering the code that fixes in document or paths + new_content = [] # type: List[CdmObject] + for sub in ac.contents: + # true means keep this as a child + if clean_sub_group(sub): + new_content.append(sub) + # clear the old content and replace + ac.contents.clear() + ac.contents.extend(new_content) + + return True + + clean_sub_group(self) + + # print('Post Prune', count_nodes(self)) + + return True + @staticmethod def _create_child_under(res_opt: 'ResolveOptions', acp: 'AttributeContextParameters') -> 'CdmAttributeContext': if not acp: @@ -508,7 +647,3 @@ def _check_lineage(sub_item: 'CdmObject') -> None: _check_lineage(self) return True - - - - diff --git a/objectModel/Python/cdm/objectmodel/cdm_attribute_group_def.py b/objectModel/Python/cdm/objectmodel/cdm_attribute_group_def.py index e99a3f67e4..043f53072d 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_attribute_group_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_attribute_group_def.py @@ -126,6 +126,8 @@ def get_name(self) -> str: return self.attribute_group_name def fetch_resolved_entity_references(self, res_opt: Optional['ResolveOptions'] = None) -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" + res_opt = res_opt if res_opt is not None else ResolveOptions(wrt_doc=self) from cdm.resolvedmodel import ResolvedEntityReferenceSet diff --git a/objectModel/Python/cdm/objectmodel/cdm_attribute_group_ref.py b/objectModel/Python/cdm/objectmodel/cdm_attribute_group_ref.py index ea195dbe50..628bd838e0 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_attribute_group_ref.py +++ b/objectModel/Python/cdm/objectmodel/cdm_attribute_group_ref.py @@ -29,6 +29,8 @@ def _copy_ref_object(self, res_opt: 'ResolveOptions', ref_to: Union[str, 'CdmAtt return host._copy_to_host(self.ctx, ref_to, simple_reference) def fetch_resolved_entity_references(self, res_opt: Optional['ResolveOptions'] = None) -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" + res_opt = res_opt if res_opt is not None else ResolveOptions(wrt_doc=self, directives=self.ctx.corpus.default_resolution_directives) ref = self._fetch_resolved_reference(res_opt) diff --git a/objectModel/Python/cdm/objectmodel/cdm_corpus_def.py b/objectModel/Python/cdm/objectmodel/cdm_corpus_def.py index b5cfa1df30..ff9a3ded7a 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_corpus_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_corpus_def.py @@ -581,9 +581,18 @@ def _create_definition_cache_tag(self, res_opt: 'ResolveOptions', definition: 'C tag_suffix = '-{}-{}'.format(kind, this_id) tag_suffix += '-({})'.format(res_opt.directives.get_tag() if res_opt.directives else '') - if res_opt._depth_info.max_depth_exceeded: - curr_depth_info = res_opt._depth_info - tag_suffix += '-{}'.format(curr_depth_info.max_depth - curr_depth_info.current_depth) + # only for attributes + if kind == 'rasb': + # if MaxDepth was not initialized before, initialize it now + if res_opt._depth_info.max_depth is None: + res_opt._depth_info.max_depth = res_opt.max_depth + + # add to the cache tag either if we reached maximum depth or how many levels we can go down until reaching the maximum depth + if res_opt._depth_info.current_depth > res_opt._depth_info.max_depth: + tag_suffix += '-overMaxDepth' + else: + curr_depth_info = res_opt._depth_info + tag_suffix += '-{}toMaxDepth'.format(curr_depth_info.max_depth - curr_depth_info.current_depth) if res_opt._in_circular_reference: tag_suffix += '-pk' if extra_tags: @@ -1227,11 +1236,12 @@ def _resolve_symbol_reference(self, res_opt: 'ResolveOptions', from_doc: 'CdmDoc wrt_doc = res_opt.wrt_doc - loop = asyncio.get_event_loop() - nest_asyncio.apply(loop) - if not loop.run_until_complete(wrt_doc._index_if_needed(res_opt, True)): - logger.error(self.ctx, self._TAG, '_resolve_symbol_reference', wrt_doc.at_corpus_path, CdmLogCode.ERR_INDEX_FAILED) - return None + if wrt_doc._needs_indexing and not wrt_doc._currently_indexing: + loop = asyncio.get_event_loop() + nest_asyncio.apply(loop) + if not loop.run_until_complete(wrt_doc._index_if_needed(res_opt, True)): + logger.error(self.ctx, self._TAG, '_resolve_symbol_reference', wrt_doc.at_corpus_path, CdmLogCode.ERR_INDEX_FAILED) + return None if wrt_doc._needs_indexing and res_opt.imports_load_strategy == ImportsLoadStrategy.DO_NOT_LOAD: logger.error(self.ctx, self._TAG, '_resolve_symbol_reference', wrt_doc.at_corpus_path, CdmLogCode.ERR_SYMBOL_NOT_FOUND, symbol_def, diff --git a/objectModel/Python/cdm/objectmodel/cdm_entity_attribute_def.py b/objectModel/Python/cdm/objectmodel/cdm_entity_attribute_def.py index fc39cbf707..3b32eb548a 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_entity_attribute_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_entity_attribute_def.py @@ -122,8 +122,12 @@ def _construct_resolved_attributes(self, res_opt: 'ResolveOptions', under: Optio proj_directive = ProjectionDirective(res_opt, self, self.entity) proj_ctx = proj_def._construct_projection_context(proj_directive, under) rasb._resolved_attribute_set = proj_def._extract_resolved_attributes(proj_ctx, under) + # from the traits of purpose and applied here + rasb._resolved_attribute_set.apply_traits(self._fetch_resolved_traits(res_opt)) else: - # An Entity Reference + # Resolution guidance + + res_opt._used_resolution_guidance = True arc = self._fetch_att_res_context(res_opt) rel_info = arc._get_relationship_info() @@ -287,6 +291,8 @@ def get_name(self) -> str: return self.name def fetch_resolved_entity_references(self, res_opt: Optional['ResolveOptions'] = None) -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" + # need to copy so that relationship depth of parent is not overwritten res_opt = res_opt.copy() if res_opt is not None else ResolveOptions(wrt_doc=self, directives=self.ctx.corpus.default_resolution_directives) diff --git a/objectModel/Python/cdm/objectmodel/cdm_entity_def.py b/objectModel/Python/cdm/objectmodel/cdm_entity_def.py index 92a868907b..a5d9066991 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_entity_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_entity_def.py @@ -34,7 +34,6 @@ class CdmEntityDefinition(CdmObjectDefinition, CdmReferencesEntities): def __init__(self, ctx: 'CdmCorpusContext', name: str, extends_entity: Optional['CdmEntityReference'] = None) -> None: super().__init__(ctx) - self._TAG = CdmEntityDefinition.__name__ # the entity attribute Context. self.attribute_context = None # type: Optional[CdmAttributeContext] @@ -48,9 +47,10 @@ def __init__(self, ctx: 'CdmCorpusContext', name: str, extends_entity: Optional[ self.extends_entity_resolution_guidance = None # type: Optional[CdmAttributeResolutionGuidanceDefinition] # --- internal --- + self._attributes = CdmCollection(self.ctx, self, CdmObjectType.TYPE_ATTRIBUTE_DEF) # type: CdmCollection self._rasb = None # type: Optional[ResolvedAttributeSetBuilder] self._resolving_entity_references = False # type: bool - self._attributes = CdmCollection(self.ctx, self, CdmObjectType.TYPE_ATTRIBUTE_DEF) # type: CdmCollection + self._TAG = CdmEntityDefinition.__name__ self._ttpm = None # type: Optional[TraitToPropertyMap] @property @@ -202,6 +202,8 @@ def _construct_resolved_attributes(self, res_opt: 'ResolveOptions', under: Optio return None if self.extends_entity_resolution_guidance: + res_opt._used_resolution_guidance = True + # some guidance was given on how to integrate the base attributes into the set. apply that guidance rts_base = self._fetch_resolved_traits(res_opt) # type: ResolvedTraitSet @@ -294,7 +296,6 @@ def copy(self, res_opt: Optional['ResolveOptions'] = None, host: Optional['CdmEn copy.extends_entity_resolution_guidance = self.extends_entity_resolution_guidance.copy(res_opt) if self.extends_entity_resolution_guidance else None copy.attribute_context = cast('CdmAttributeContext', self.attribute_context.copy(res_opt)) if self.attribute_context else None - att: CdmAttributeItem for att in self.attributes: copy.attributes.append(att.copy(res_opt)) @@ -302,7 +303,6 @@ def copy(self, res_opt: Optional['ResolveOptions'] = None, host: Optional['CdmEn return copy - # TODO: Refactor and split this function to be more structured. async def create_resolved_entity_async(self, new_ent_name: str, res_opt: Optional['ResolveOptions'] = None, folder: 'CdmFolderDefinition' = None, new_doc_name: str = None) -> 'CdmEntityDefinition': """Create a resolved copy of the entity.""" @@ -380,6 +380,9 @@ async def create_resolved_entity_async(self, new_ent_name: str, res_opt: Optiona # the context where it was created last modified, merged, created ras = self._fetch_resolved_attributes(res_opt_copy, acp_ent) + if res_opt_copy._used_resolution_guidance: + logger.warning(ctx, self._TAG, self.create_resolved_entity_async.__name__, self.at_corpus_path, CdmLogCode.WARN_DEPRECATED_RESOLUTION_GUIDANCE) + if ras is None: return None @@ -410,24 +413,17 @@ async def create_resolved_entity_async(self, new_ent_name: str, res_opt: Optiona # TEST CODE in C# by Jeff # run over the resolved attributes and make sure none have the dummy context - # Action testResolveAttributeCtx = null; - # testResolveAttributeCtx = (rasSub) => - # { - # if (rasSub.Set.Count != 0 && rasSub.AttributeContext.AtCoprusPath.StartsWith("cacheHolder")) - # System.Diagnostics.Debug.WriteLine("Bad"); - # rasSub.Set.ForEach(ra => - # { - # if (ra.AttCtx.AtCoprusPath.StartsWith("cacheHolder")) - # System.Diagnostics.Debug.WriteLine("Bad"); + # def test_resolve_attribute_ctx(ras_sub) -> None: + # if len(ras_sub.set) != 0 and ras_sub.attribute_context.at_corpus_path.startswith('cacheHolder'): + # print('Bad') + # for ra in ras_sub.set: + # if ra.att_ctx.at_corpus_path.startswith('cacheHolder'): + # print('Bad') # # the target for a resolved att can be a typeAttribute OR it can be another resolvedAttributeSet (meaning a group) - # if (ra.Target is ResolvedAttributeSet) - # { - # testResolveAttributeCtx(ra.Target as ResolvedAttributeSet); - # } - # }); - # }; - # testResolveAttributeCtx(ras); + # if isinstance(ra.target, ResolvedAttributeSet): + # test_resolve_attribute_ctx(ra.target) + # test_resolve_attribute_ctx(ras) # add the traits of the entity, also add to attribute context top node @@ -483,84 +479,11 @@ def _point_context_at_resolved_atts(ras_sub: 'ResolvedAttributeSet', path: str) # explain anything our goal now is to prune that tree to just have the stuff one may need # Do this by keeping the leafs and all of the lineage nodes for the attributes that end up in the # resolved entity along with some special nodes that explain entity structure and inherit - - # Run over the whole tree and make a set of the nodes that should be saved for sure. - # This is anything NOT under a generated set (so base entity chains, entity attributes entity definitions) - nodes_to_save = set() - - def _save_structure_nodes(sub_item: CdmObject) -> bool: - ac = cast(CdmAttributeContext, sub_item) if isinstance(sub_item, CdmAttributeContext) else None # type: CdmAttributeContext - if not ac or ac.type == CdmAttributeContextType.GENERATED_SET: - return True - nodes_to_save.add(ac) - if not ac.contents: - return True - - # look at all children - for sub_sub in ac.contents: - if _save_structure_nodes(sub_sub) is False: - return False - return True - - if _save_structure_nodes(att_ctx) is False: + # print('res ent', ent_name) + if not att_ctx._prune_to_scope(all_primary_ctx): + # TODO: log error return None - # Next, look at the attCtx for every resolved attribute. follow the lineage chain - # and mark all of those nodes as ones to save - # Also mark any parents of those as savers - - # Helper that save the passed node and anything up the parent chain - def _save_parent_nodes(curr_node: CdmAttributeContext) -> bool: - if curr_node in nodes_to_save: - return True - nodes_to_save.add(curr_node) - # get the parent - if curr_node.parent and curr_node.parent.explicit_reference: - return _save_parent_nodes(cast(CdmAttributeContext, curr_node.parent.explicit_reference)) - return True - - # Helper that saves the current node (and parents) plus anything in the lineage (with their parents) - def _save_lineage_nodes(curr_node: CdmAttributeContext) -> bool: - if _save_parent_nodes(curr_node) is False: - return False - if curr_node.lineage: - for lin in curr_node.lineage: - if lin.explicit_reference: - if _save_lineage_nodes(cast(CdmAttributeContext, lin.explicit_reference)) is False: - return False - return True - - # so, do that ^^^ for every primary context found earlier - for prim_ctx in all_primary_ctx: - if _save_lineage_nodes(prim_ctx) is False: - return None - - # Now the cleanup, we have a set of the nodes that should be saved - # Run over the tree and re-build the contents collection with only the things to save - def _clean_sub_group(sub_item: CdmObject) -> bool: - if sub_item.object_type == CdmObjectType.ATTRIBUTE_REF: - return True # not empty - - ac = cast(CdmAttributeContext, sub_item) - - if ac not in nodes_to_save: - return False # don't even look at content, this all goes away - - if ac.contents: - # need to clean up the content array without triggering the code that fixes in document or paths - new_content = [] - for sub in ac.contents: - # true means keep this as a child - if _clean_sub_group(sub) is True: - new_content.append(sub) - # clear the old content and replace - ac.contents.clear() - ac.contents.extend(new_content) - - return True - - _clean_sub_group(att_ctx) - # Create an all-up ordering of attributes at the leaves of this tree based on insert order. Sort the attributes # in each context by their creation order and mix that with the other sub-contexts that have been sorted. def get_order_num(item: 'CdmObject') -> int: @@ -806,6 +729,8 @@ def _get_property(self, property_name: str) -> Any: return self._trait_to_property_map._fetch_property_value(property_name, True) def fetch_resolved_entity_references(self, res_opt: 'ResolveOptions') -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" + # this whole resolved entity ref goo will go away when resolved documents are done. # for now, it breaks if structured att sets get made. from cdm.resolvedmodel import ResolvedEntityReferenceSet diff --git a/objectModel/Python/cdm/objectmodel/cdm_manifest_def.py b/objectModel/Python/cdm/objectmodel/cdm_manifest_def.py index 23fdd6b6d8..1430c1ccaf 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_manifest_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_manifest_def.py @@ -93,19 +93,19 @@ def copy(self, res_opt: Optional['ResolveOptions'] = None, host: Optional['CdmMa copy.entities.clear() for ent in self.entities: - copy.entities.append(ent) + copy.entities.append(ent.copy(res_opt)) copy.relationships.clear() for rel in self.relationships: - copy.relationships.append(rel) + copy.relationships.append(rel.copy(res_opt)) copy.sub_manifests.clear() for man in self.sub_manifests: - copy.sub_manifests.append(man) + copy.sub_manifests.append(man.copy(res_opt)) copy.exhibits_traits.clear() for et in self.exhibits_traits: - copy.exhibits_traits.append(et) + copy.exhibits_traits.append(et.copy(res_opt)) return copy diff --git a/objectModel/Python/cdm/objectmodel/cdm_object.py b/objectModel/Python/cdm/objectmodel/cdm_object.py index 635296e367..beb0ade3d6 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_object.py +++ b/objectModel/Python/cdm/objectmodel/cdm_object.py @@ -161,8 +161,18 @@ def _fetch_resolved_attributes(self, res_opt: 'ResolveOptions', acp_in_context: if o_def is not None: ctx.corpus._register_definition_reference_symbols(o_def, kind, res_opt._symbol_ref_set) + if self.object_type == CdmObjectType.ENTITY_DEF: + # if we just got attributes for an entity, take the time now to clean up this cached tree and prune out + # things that don't help explain where the final set of attributes came from + if under_ctx: + scopes_for_attributes = set() # type: Set[CdmAttributeContext] + under_ctx._collect_context_from_atts(rasb_cache._resolved_attribute_set, scopes_for_attributes) # the context node for every final attribute + if not under_ctx._prune_to_scope(scopes_for_attributes): + return None + # get the new cache tag now that we have the list of docs cache_tag = ctx.corpus._create_definition_cache_tag(res_opt, self, kind, 'ctx' if acp_in_context else None) + # save this as the cached version if cache_tag: ctx._cache[cache_tag] = rasb_cache diff --git a/objectModel/Python/cdm/objectmodel/cdm_object_ref.py b/objectModel/Python/cdm/objectmodel/cdm_object_ref.py index cb08d2df4d..6eefca5553 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_object_ref.py +++ b/objectModel/Python/cdm/objectmodel/cdm_object_ref.py @@ -246,9 +246,8 @@ def fetch_object_definition(self, res_opt: Optional['ResolveOptions'] = None) -> if res_opt is None: res_opt = ResolveOptions(self, self.ctx.corpus.default_resolution_directives) definition = self._fetch_resolved_reference(res_opt) - if definition is not None: - if isinstance(definition, CdmObjectReference): - definition = definition.fetch_resolved_reference() + if definition is not None and isinstance(definition, CdmObjectReference): + definition = definition.fetch_resolved_reference() if definition is not None and not isinstance(definition, CdmObjectReference): return definition return None diff --git a/objectModel/Python/cdm/objectmodel/cdm_references_entities.py b/objectModel/Python/cdm/objectmodel/cdm_references_entities.py index 370eb2bdd4..e5a9c6d486 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_references_entities.py +++ b/objectModel/Python/cdm/objectmodel/cdm_references_entities.py @@ -12,4 +12,6 @@ class CdmReferencesEntities(ABC): @abstractmethod def fetch_resolved_entity_references(self, res_opt: 'ResolveOptions') -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" + raise NotImplementedError() diff --git a/objectModel/Python/cdm/objectmodel/cdm_type_attribute_def.py b/objectModel/Python/cdm/objectmodel/cdm_type_attribute_def.py index fb6c4125b1..abddd68d2c 100644 --- a/objectModel/Python/cdm/objectmodel/cdm_type_attribute_def.py +++ b/objectModel/Python/cdm/objectmodel/cdm_type_attribute_def.py @@ -193,6 +193,7 @@ def _construct_resolved_attributes(self, res_opt: 'ResolveOptions', under: Optio # make a copy and add defaults if missing res_guide_with_default = None if self.resolution_guidance is not None: + res_opt._used_resolution_guidance = True res_guide_with_default = self.resolution_guidance.copy(res_opt) else: res_guide_with_default = CdmAttributeResolutionGuidanceDefinition(self.ctx) @@ -261,6 +262,7 @@ def _get_property(self, property_name: str) -> Any: return self._trait_to_property_map._fetch_property_value(property_name, True) def fetch_resolved_entity_references(self, res_opt: 'ResolveOptions') -> 'ResolvedEntityReferenceSet': + """Deprecated: for internal use only""" return def is_derived_from(self, base: str, res_opt: Optional['ResolveOptions'] = None) -> bool: diff --git a/objectModel/Python/cdm/resx/logmessages.txt b/objectModel/Python/cdm/resx/logmessages.txt index b563be4f88..54fe03d898 100644 --- a/objectModel/Python/cdm/resx/logmessages.txt +++ b/objectModel/Python/cdm/resx/logmessages.txt @@ -107,6 +107,7 @@ ERR_VALDN_MISSING_DOC: Document '{0}' is not in a folder ERR_VALDN_MISSING_LANGUAGE_TAG: Default value missing languageTag or displayText. ERR_UNRECOGNIZED_TYPE: Unrecognized type. ERR_REL_UNDEFINED: Trying to create relationship to an entity not defined +WARN_DEPRECATED_RESOLUTION_GUIDANCE: Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview. WARN_PARTITION_GLOB_AND_REGEX_PRESENT: The Data Partition Pattern contains both a glob pattern ({0}) and a regular expression ({1}) set, the glob pattern will be used. WARN_DOC_IMPORT_NOT_LOADED: Import document {0} not loaded. This might cause an unexpected output. WARN_PARTITION_FILE_FETCH_FAILED: Failed to fetch all files in the folder location '{0}' described by a partition pattern. Exception {1} diff --git a/objectModel/Python/cdm/utilities/resolve_options.py b/objectModel/Python/cdm/utilities/resolve_options.py index 0dd8bad37b..7e072571ef 100644 --- a/objectModel/Python/cdm/utilities/resolve_options.py +++ b/objectModel/Python/cdm/utilities/resolve_options.py @@ -80,6 +80,9 @@ def __init__(self, wrt_doc: Optional[Union['CdmDocumentDefinition', 'CdmObject'] self._map_old_ctx_to_new_ctx = None # type: Dict['CdmAttributeContext', 'CdmAttributeContext'] + # Indicates if resolution guidance was used at any point during resolution + self._used_resolution_guidance = False # type: bool + @property def strict_validation(self) -> Optional[bool]: """When enabled, all the imports will be loaded and the references checked otherwise will be delayed until the symbols are required.""" @@ -121,6 +124,7 @@ def copy(self) -> 'ResolveOptions': res_opt_copy.imports_load_strategy = self.imports_load_strategy res_opt_copy._save_resolutions_on_copy = self._save_resolutions_on_copy res_opt_copy._currently_resolving_entities = set(self._currently_resolving_entities) + res_opt_copy._used_resolution_guidance = self._used_resolution_guidance if self.directives: res_opt_copy.directives = self.directives.copy() diff --git a/objectModel/Python/cdm/utilities/trait_to_property_map.py b/objectModel/Python/cdm/utilities/trait_to_property_map.py index ac13d0b744..50e456271b 100644 --- a/objectModel/Python/cdm/utilities/trait_to_property_map.py +++ b/objectModel/Python/cdm/utilities/trait_to_property_map.py @@ -4,7 +4,6 @@ from typing import Any, Callable, List, Optional, TYPE_CHECKING from cdm.enums import CdmDataFormat, CdmObjectType, CdmLogCode -from cdm.resolvedmodel.resolved_trait import ResolvedTrait from .logging import logger if TYPE_CHECKING: @@ -44,6 +43,8 @@ def _fetch_trait_ref_argument_value(trait_ref_or_def: 'CdmTraitDefOrRef', arg_name: str) -> Any: + from cdm.resolvedmodel.resolved_trait import ResolvedTrait + if trait_ref_or_def is None: return None @@ -428,7 +429,7 @@ def _fetch_default_value(self, only_from_property: bool) -> Any: return def_val if def_val.object_type == CdmObjectType.ENTITY_REF: - c_ent = def_val.fetch_object_definition(None) + c_ent = def_val.fetch_object_definition() if c_ent is not None: es_name = c_ent.entity_shape.fetch_object_definition_name() corr = es_name == 'listLookupCorrelatedValues' diff --git a/objectModel/Python/requirements.txt b/objectModel/Python/requirements.txt index 2944aa889b..a5a9f91546 100644 --- a/objectModel/Python/requirements.txt +++ b/objectModel/Python/requirements.txt @@ -1,34 +1,4 @@ -asn1crypto==0.24.0 -astroid==2.2.5 -atomicwrites==1.3.0 -attrs==19.1.0 -certifi==2019.6.16 -cffi==1.12.3 -chardet==3.0.4 -colorama==0.4.3 -cryptography==3.4.7 -idna==2.8 -importlib-metadata==1.0 -lazy-object-proxy==1.3.1 -nest-asyncio==1.4.3 -msal==1.11.0 -mccabe==0.6.1 -more-itertools==7.2.0 -packaging==19.1 -pathlib2==2.3.4 -pluggy>=0.12.0,<=0.13.1 -py==1.10.0 -pycparser==2.19 -PyJWT==1.7.1 -pyparsing==2.4.2 -python-dateutil==2.8.0 +nest-asyncio>=1.4.3,<2 +msal==1.11.0,<2 +python-dateutil>=2.8.0 regex==2020.11.13 -requests>=2.22.0,<=2.24.0 -rope==0.14.0 -six>=1.12.0,<=1.13.0 -typed-ast==1.4.0 -typing-extensions==3.7.4 -urllib3>=1.25.9,<=1.25.10 -wcwidth==0.1.7 -wrapt==1.11.1 -zipp==0.5.2 \ No newline at end of file diff --git a/objectModel/Python/setup.py b/objectModel/Python/setup.py index 1ec02b4d1b..982b841f07 100644 --- a/objectModel/Python/setup.py +++ b/objectModel/Python/setup.py @@ -77,7 +77,7 @@ def run(self): setuptools.setup( name='commondatamodel-objectmodel', - version='1.2.1', + version='1.2.2', author='Microsoft', description='Common Data Model Object Model library for Python', url='https://github.com/microsoft/CDM/tree/master/objectModel/Python', diff --git a/objectModel/Python/tests/cdm/projection/attribute_context_util.py b/objectModel/Python/tests/cdm/projection/attribute_context_util.py index 2396560d11..9c22b40cf6 100644 --- a/objectModel/Python/tests/cdm/projection/attribute_context_util.py +++ b/objectModel/Python/tests/cdm/projection/attribute_context_util.py @@ -98,7 +98,7 @@ def _get_argument_values(self, args: 'CdmArgumentDefinition') -> None: self._bldr += '\n' @staticmethod - async def validate_attribute_context(test: 'TestCase', corpus: 'CdmCorpusDefinition', expected_output_path: str, entity_name: str, resolved_entity: 'CdmEntityDefinition') -> None: + async def validate_attribute_context(test: 'TestCase', expected_output_path: str, entity_name: str, resolved_entity: 'CdmEntityDefinition', update_expected_output: bool = False) -> None: """A function to validate if the attribute context tree & traits generated for a resolved entity is the same as the expected and saved attribute context tree & traits for a test case""" if resolved_entity.attribute_context: @@ -109,13 +109,16 @@ async def validate_attribute_context(test: 'TestCase', corpus: 'CdmCorpusDefinit # Save Actual AttrCtx_*.txt and Resolved_*.cdm.json actual_text = attr_ctx_util.get_attribute_context_strings(resolved_entity) - actual_attr_ctx_file = open(actual_file_path, "w") - actual_attr_ctx_file.write(actual_text) - actual_attr_ctx_file.close() + with open(actual_file_path, 'w') as actual_attr_ctx_file: + actual_attr_ctx_file.write(actual_text) await resolved_entity.in_document.save_as_async('Resolved_{}.cdm.json'.format(entity_name), False) # Expected expected_file_path = os.path.join(expected_output_path, 'AttrCtx_{}.txt'.format(entity_name)) + if update_expected_output: + with open(expected_file_path, 'w') as expected_attr_ctx_file: + expected_attr_ctx_file.write(actual_text) + with open(expected_file_path) as expected_file: expected_text = expected_file.read() diff --git a/objectModel/Python/tests/cdm/projection/test_forward_compatibility.py b/objectModel/Python/tests/cdm/projection/test_forward_compatibility.py index 2f1f9aea51..b8ae51c4d4 100644 --- a/objectModel/Python/tests/cdm/projection/test_forward_compatibility.py +++ b/objectModel/Python/tests/cdm/projection/test_forward_compatibility.py @@ -14,7 +14,7 @@ class ForwardCompatibilityTest(unittest.TestCase): """Tests all the projections will not break the OM even if not implemented.""" - # The path between TestDataPath and TestName. + # The path between TestDataPath and TestName tests_subpath = os.path.join('Cdm', 'Projection', 'TestForwardCompatibility') @async_test diff --git a/objectModel/Python/tests/cdm/relationship/test_calculate_relationship.py b/objectModel/Python/tests/cdm/relationship/test_calculate_relationship.py index 30c5088959..980256c446 100644 --- a/objectModel/Python/tests/cdm/relationship/test_calculate_relationship.py +++ b/objectModel/Python/tests/cdm/relationship/test_calculate_relationship.py @@ -88,7 +88,7 @@ async def test_composite_key_polymorphic_relationship(self): await self._test_run(test_name, entity_name, True) - async def _test_run(self, test_name: str, entity_name: str, is_entity_set: bool) -> None: + async def _test_run(self, test_name: str, entity_name: str, is_entity_set: bool, update_expected_output: bool = False) -> None: """Common test code for these test cases""" corpus = TestHelper.get_local_corpus(self.tests_subpath, test_name) expected_output_folder = TestHelper.get_expected_output_folder_path(self.tests_subpath, test_name) @@ -103,11 +103,8 @@ async def _test_run(self, test_name: str, entity_name: str, is_entity_set: bool) self.assertIsNotNone(entity) resolved_entity = await ProjectionTestUtils.get_resolved_entity(corpus, entity, ['referenceOnly']) self._assert_entity_shape_in_resolved_entity(resolved_entity, is_entity_set) - actual_attr_ctx = self._get_attribute_context_string(resolved_entity, entity_name, actual_output_folder) - with open(os.path.join(expected_output_folder, 'AttrCtx_{}.txt'.format(entity_name))) as expected_file: - expected_attr_ctx = expected_file.read() - self.assertEqual(expected_attr_ctx, actual_attr_ctx) + await AttributeContextUtil.validate_attribute_context(self, expected_output_folder, entity_name, resolved_entity, update_expected_output) await corpus.calculate_entity_graph_async(manifest) await manifest.populate_manifest_relationships_async() diff --git a/objectModel/Python/tests/cdm/resolution/test_entity_resolution.py b/objectModel/Python/tests/cdm/resolution/test_entity_resolution.py index 27f0a46349..0e625c31c4 100644 --- a/objectModel/Python/tests/cdm/resolution/test_entity_resolution.py +++ b/objectModel/Python/tests/cdm/resolution/test_entity_resolution.py @@ -4,6 +4,10 @@ import os import unittest +from tests.cdm.projection.attribute_context_util import AttributeContextUtil + +from tests.utilities.projection_test_utils import ProjectionTestUtils + from cdm.enums import CdmStatusLevel from cdm.objectmodel import CdmCorpusDefinition, CdmManifestDefinition, CdmEntityDefinition from cdm.storage import LocalAdapter @@ -200,3 +204,16 @@ async def test_setting_traits_for_resolution_guidance_attributes(self): resolved_entity = await entity.create_resolved_entity_async('resolved2', res_opt) self.assertIsNotNone(resolved_entity.attributes[0].applied_traits.item('is.linkedEntity.identifier')) + + @async_test + async def test_applied_traits_in_attributes(self): + """ + Test that traits(including the ones inside of dataTypeRefence and PurposeReference) are applied to an entity attribute and type attribute. + """ + corpus = TestHelper.get_local_corpus(self.tests_sub_path, 'test_applied_traits_in_attributes') # type: CdmCorpusDefinition + expected_output_folder = TestHelper.get_expected_output_folder_path(self.tests_sub_path, 'test_applied_traits_in_attributes') + entity = await corpus.fetch_object_async('local:/Sales.cdm.json/Sales') # type: CdmEntityDefinition + resolved_entity = await ProjectionTestUtils.get_resolved_entity(corpus, entity, ['referenceOnly']) + + await AttributeContextUtil.validate_attribute_context(self, expected_output_folder, 'Sales', resolved_entity) + diff --git a/objectModel/Python/tests/cdm/resolution/test_entity_resolution_trait_group.py b/objectModel/Python/tests/cdm/resolution/test_entity_resolution_trait_group.py index 3c4041f1e1..f28abdc372 100644 --- a/objectModel/Python/tests/cdm/resolution/test_entity_resolution_trait_group.py +++ b/objectModel/Python/tests/cdm/resolution/test_entity_resolution_trait_group.py @@ -31,7 +31,8 @@ async def test_traits_from_trait_group(self): corpus = TestHelper.get_local_corpus(self.tests_sub_path, 'TestResolvedTraitGroup') def callback(status_level: 'CdmStatusLevel', message: str): - self.fail('Received {} message: {}'.format(status_level, message)) + if 'Resolution guidance is being deprecated in favor of Projections.' not in message: + self.fail('Received {} message: {}'.format(status_level, message)) corpus.set_event_callback(callback, CdmStatusLevel.WARNING) ent = await corpus.fetch_object_async('local:/E2EResolution/Contact.cdm.json/Contact') # type: CdmEntityDefinition diff --git a/objectModel/Python/tests/cdm/resolution_guidance/common_test.py b/objectModel/Python/tests/cdm/resolution_guidance/common_test.py index e3163cce94..b1e5f7cdef 100644 --- a/objectModel/Python/tests/cdm/resolution_guidance/common_test.py +++ b/objectModel/Python/tests/cdm/resolution_guidance/common_test.py @@ -147,13 +147,19 @@ async def run_test_with_values( except Exception as e: self.fail(e) - async def save_actual_entity_and_validate_with_expected(self, expected_path: str, actual_resolved_entity_def: CdmEntityDefinition) -> None: + async def save_actual_entity_and_validate_with_expected(self, expected_path: str, actual_resolved_entity_def: CdmEntityDefinition, update_expected_output: bool = False) -> None: """Runs validation to test actual output vs expected output for attributes collection vs attribute context.""" await actual_resolved_entity_def.in_document.save_as_async(actual_resolved_entity_def.in_document.name) actual_path = actual_resolved_entity_def.ctx.corpus.storage.corpus_path_to_adapter_path(actual_resolved_entity_def.in_document.at_corpus_path) - with open(expected_path, 'r', encoding='utf-8') as expected_file: - expected_ctx = expected_file.read() with open(actual_path, 'r', encoding='utf-8') as actual_file: actual_ctx = actual_file.read() + + if update_expected_output: + with open(expected_path, 'w', encoding='utf-8') as expected_file: + expected_file.write(actual_ctx) + + with open(expected_path, 'r', encoding='utf-8') as expected_file: + expected_ctx = expected_file.read() + self.assertEqual(expected_ctx, actual_ctx) diff --git a/objectModel/Python/tests/cdm/resolution_guidance/test_resolution_guidance.py b/objectModel/Python/tests/cdm/resolution_guidance/test_resolution_guidance.py index 674c8f882f..0f29c96fbc 100644 --- a/objectModel/Python/tests/cdm/resolution_guidance/test_resolution_guidance.py +++ b/objectModel/Python/tests/cdm/resolution_guidance/test_resolution_guidance.py @@ -5,7 +5,7 @@ import os import unittest -from cdm.enums import CdmStatusLevel +from cdm.enums import CdmLogCode, CdmStatusLevel from cdm.objectmodel import CdmCorpusDefinition, CdmEntityDefinition, CdmFolderDefinition from cdm.storage import LocalAdapter from cdm.utilities import AttributeResolutionDirectiveSet, ResolveOptions @@ -16,6 +16,25 @@ class ResolutionGuidanceTest(unittest.TestCase): tests_subpath = os.path.join('Cdm', 'ResolutionGuidance') + @async_test + async def test_resolution_guidance_deprecation(self): + corpus = TestHelper.get_local_corpus(self.tests_subpath, 'test_resolution_guidance_deprecation') + + # Tests warning log when resolution guidance is used on a data typed attribute. + entity = await corpus.fetch_object_async('local:/TypeAttribute.cdm.json/Entity') # type: CdmEntityDefinition + await entity.create_resolved_entity_async('res-entity') + TestHelper.assert_cdm_log_code_equality(corpus, CdmLogCode.WARN_DEPRECATED_RESOLUTION_GUIDANCE, self) + + # Tests warning log when resolution guidance is used on a entity typed attribute. + entity = await corpus.fetch_object_async('local:/EntityAttribute.cdm.json/Entity') # type: CdmEntityDefinition + await entity.create_resolved_entity_async('res-entity') + TestHelper.assert_cdm_log_code_equality(corpus, CdmLogCode.WARN_DEPRECATED_RESOLUTION_GUIDANCE, self) + + # Tests warning log when resolution guidance is used when extending an entity. + entity = await corpus.fetch_object_async('local:/ExtendsEntity.cdm.json/Entity') # type: CdmEntityDefinition + await entity.create_resolved_entity_async('res-entity') + TestHelper.assert_cdm_log_code_equality(corpus, CdmLogCode.WARN_DEPRECATED_RESOLUTION_GUIDANCE, self) + @async_test async def test_by_entity_name(self): """Resolution Guidance Test - Resolve entity by name""" diff --git a/objectModel/Python/tests/cdm/test_manifest_definition.py b/objectModel/Python/tests/cdm/test_manifest_definition.py new file mode 100644 index 0000000000..270fdd6c44 --- /dev/null +++ b/objectModel/Python/tests/cdm/test_manifest_definition.py @@ -0,0 +1,36 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. + +import unittest + +from cdm.objectmodel import CdmCorpusDefinition, CdmManifestDefinition + + +class ManifestDefinitionTests(unittest.TestCase): + def test_manifest_copy(self): + """Tests if the copy function creates copies of the sub objects""" + + corpus = CdmCorpusDefinition() + manifest = CdmManifestDefinition(corpus.ctx, 'name') + + entity_name = 'entity' + sub_manifest_name = 'sub_manifest' + relationship_name = 'relName' + trait_name = 'traitName' + + entity_dec = manifest.entities.append(entity_name) + sub_manifest = manifest.sub_manifests.append(sub_manifest_name) + relationship = manifest.relationships.append(relationship_name) + trait = manifest.exhibits_traits.append(trait_name) + + copy = manifest.copy() # type: CdmManifestDefinition + copy.entities[0].entity_name = 'newEntity' + copy.sub_manifests[0].manifest_name = 'newSubManifest' + copy.relationships[0].relationship_name = 'newRelName' + copy.exhibits_traits[0].named_reference = 'newTraitName' + + + self.assertEquals(entity_name, entity_dec.entity_name) + self.assertEquals(sub_manifest_name, sub_manifest.manifest_name) + self.assertEquals(relationship_name, relationship.relationship_name) + self.assertEquals(trait_name, trait.named_reference) diff --git a/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json b/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json index 4b2bb12b66..c8af66d1eb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json +++ b/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "symbolEntityAttribute", "entity": { - "entityReference": "symbolEntity" + "source": "symbolEntity" } } ] diff --git a/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json b/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json index 4bccd86ce4..2363f446fe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json +++ b/objectModel/Python/tests/testdata/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "fromEntityAttribute", "entity": { - "entityReference": "fromEntity" + "source": "fromEntity" } } ] diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt new file mode 100644 index 0000000000..72e754ca66 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt @@ -0,0 +1,105 @@ +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count/Resolved_TestAllOperations/hasAttributes/count/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support/Resolved_TestAllOperations/hasAttributes/support/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName/Resolved_TestAllOperations/hasAttributes/type/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/A@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/B@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/C@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/A@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/B@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/C@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3/Resolved_TestAllOperations/hasAttributes/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3/Resolved_TestAllOperations/hasAttributes/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3/Resolved_TestAllOperations/hasAttributes/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A/combined +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined/Resolved_TestAllOperations/hasAttributes/combined/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA/Resolved_TestAllOperations/hasAttributes/NewA/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_TestAllOperations/hasAttributes/A_FK/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/B +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/C +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/count +is.linkedEntity.array.count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/support +is.addedInSupportOf + [Parameter (Name / DefaultValue): inSupportOf / ] + [Argument Value: C] +is.virtual.attribute +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/type +is.linkedEntity.name +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/NewA +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A_FK +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/TestSource.cdm.json/TestSource,A,replaceFK_TestSource] diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 64a36ebe69..5239494af2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,7 +14,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ec454952ae..705379816f 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -25,6 +23,9 @@ output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email/Resolved_NewPerson/hasAttributes/PersonAttributeGroup/members/email/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age/Resolved_NewPerson/hasAttributes/age/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/phoneNumber diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 4f0170be17..10d548107c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fbe5e69ceb..dc1df898c4 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed0342ab77..e483ba2d07 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 99665fd3e4..e22c1145ea 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -1,38 +1,38 @@ -Resolved_Person_default/attributeContext/Resolved_Person_default/extends -Resolved_Person_default/attributeContext/Resolved_Person_default/extends/CdmEntity -Resolved_Person_default/attributeContext/Resolved_Person_default/name -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/name/Resolved_Person_default/hasAttributes/name/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/age -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/age/Resolved_Person_default/hasAttributes/age/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/address -Resolved_Person_default/attributeContext/Resolved_Person_default/address/projection -Resolved_Person_default/attributeContext/Resolved_Person_default/address/projection/source -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address/Resolved_Person_default/hasAttributes/AddressAttributeGroup/members/address/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/phoneNumber -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/phoneNumber/Resolved_Person_default/hasAttributes/phoneNumber/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/email -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/email/Resolved_Person_default/hasAttributes/email/(ref) -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/name +Resolved_Person/attributeContext/Resolved_Person/extends +Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity +Resolved_Person/attributeContext/Resolved_Person/name +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) +Resolved_Person/attributeContext/Resolved_Person/age +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/age/Resolved_Person/hasAttributes/age/(ref) +Resolved_Person/attributeContext/Resolved_Person/address +Resolved_Person/attributeContext/Resolved_Person/address/projection +Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address/Resolved_Person/hasAttributes/AddressAttributeGroup/members/address/(ref) +Resolved_Person/attributeContext/Resolved_Person/phoneNumber +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/phoneNumber/Resolved_Person/hasAttributes/phoneNumber/(ref) +Resolved_Person/attributeContext/Resolved_Person/email +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/email/Resolved_Person/hasAttributes/email/(ref) +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/age +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/AddressAttributeGroup/(ref) -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/phoneNumber +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/AddressAttributeGroup/(ref) +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/email +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index bba3a7ad2b..053f314830 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9ac859b512..96031b910d 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63e35d480f..f4e2eb25b5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/address @@ -26,10 +24,16 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/new_name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/new_age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/new_address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount/new_someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name/Resolved_NewPerson/hasAttributes/new_name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index fe0a943be1..57c16bb0c5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,11 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt index 12ff168557..4f8dfb0f6c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt index ff3191b029..0a66e586a2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,11 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 2242d30372..adef43a487 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 5784b79231..02649fc140 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,11 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 46a33e42d5..bb8697d6f8 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 1796b68a1b..e3930cb4cf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 52fbd75e21..8fb465ecae 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,8 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 113df5475a..1429f693f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 387cf51fad..ac8a8d5b12 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 85e00ba0d2..93368744c9 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,13 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt index 901dbaea00..fcb83a949a 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt @@ -18,6 +18,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/emailId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone @@ -27,6 +28,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social @@ -36,6 +38,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationCombineAttributes @@ -57,6 +60,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/contactId/new_contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/account +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary/Resolved_Customer/hasAttributes/new_isPrimary/(ref) Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_contactId diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt index 901113431d..4be9f15092 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt @@ -8,8 +8,6 @@ Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityA Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_NestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt index be2ef5e795..9823f1a921 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt @@ -4,8 +4,6 @@ Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAtt Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends/CdmEntity Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute/Resolved_TestEntAttrProj/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/hasAttributes/TestAttribute diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt index 621bbdff6c..73ea0f76d0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt @@ -6,8 +6,6 @@ Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedPr Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt index bd0ee0d0e0..814d044be0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt @@ -2,8 +2,6 @@ Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/ext Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute/Resolved_TestEntityProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/hasAttributes/TestAttribute diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 56c9ca1d91..55f2d99206 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index e13c431847..6862d18e21 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,36 +4,32 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/age1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/address1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/phoneNumber1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/email1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/name2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/age2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/address2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/phoneNumber2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/email2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/name3 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/address3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/phoneNumber3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/email3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name1 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 6e2d14df45..4bdc8ca315 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 4b41c95d04..6ba7fc48ac 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/address @@ -16,13 +14,12 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure @@ -33,6 +30,7 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/_generatedAttributeSet_template/_generatedAttributeRound0/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAge Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName/Resolved_NewPerson/hasAttributes/PersonInfoName/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAddress diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEaNameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index 234543d415..8550bf5b79 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt index f9e05b0dec..68621afccf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends/CdmEntity -Resolved_Child/attributeContext/Resolved_Child/extends/Person/phoneNumber -Resolved_Child/attributeContext/Resolved_Child/extends/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/Person/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/Person/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 625b0a7a4d..7d661e88bc 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address @@ -11,6 +9,8 @@ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6a89967584..a212526b27 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 7aa34cf438..903904e129 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name @@ -15,6 +13,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index c36d9dde63..027e4bf78c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed9ac5a1c6..473afb5dec 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -15,9 +13,11 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttr Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 33546136cc..c36c5487ab 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,8 +14,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index 3ce7c5663d..e2b169e510 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -22,8 +22,6 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/Conta Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index e4d8c86a78..ae86ac7875 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -29,9 +29,13 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/proje Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId/Resolved_BusinessPerson/hasAttributes/emailId/(ref) Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93ddb42189..1d3f746d7b 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address @@ -21,6 +19,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsan/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsan/ExpectedOutput/AttrCtx_NewPerson_default.txt index 340219c676..5ae50a2833 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsan/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsan/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93a0378283..3513cdb156 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestSsanRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 8db35dbc0e..7e8c14168b 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -3,6 +3,9 @@ Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity Resolved_Person/attributeContext/Resolved_Person/address Resolved_Person/attributeContext/Resolved_Person/address/projection Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_Person/attributeContext/Resolved_Person/name output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) Resolved_Person/attributeContext/Resolved_Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 85b0b16f15..56b912d14b 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index fba97959fb..1e1d1b2d2f 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -6,15 +6,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/project Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d5835ac6a..6c64c2fba6 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -8,8 +8,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/address @@ -18,10 +16,15 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name @@ -34,8 +37,34 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1/name1 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 1d9a8fec7b..ab08ce5691 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index a1ab17f96e..c89b71b328 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,9 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d483f37ee..dc353d7f95 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/proje Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 2dee2a32b1..e8be825363 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,9 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index b4f6d6a15c..e5929f6606 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 3b0394191b..aea14a2abd 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index e2a448d6d9..e9f820c691 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -10,8 +10,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index efcd7768c1..e7125e5f4c 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -2,14 +2,8 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count/Resolved_BusinessPerson/hasAttributes/count/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index d0cfd18e37..153f9f0498 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 451f798133..956998c967 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestStartGtEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestStartGtEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestStartGtEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionExpansion/TestStartGtEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 886c0b69ab..c4d1e41357 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 0d82aa406e..397a36fe71 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -4,14 +4,7 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt index 7ba825ce11..d1b9eb3648 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt @@ -6,11 +6,6 @@ Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesComp Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends/CdmEntity -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId1 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId2 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductName Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt index d31b13c0ed..f6df6e1030 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt @@ -4,8 +4,6 @@ Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/Pro Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesEntityAttribute.cdm.json/Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId/Resolved_SalesEntityAttribute/hasAttributes/ProductId/(ref) Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt index da5e883690..13ec6bfbcd 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt @@ -6,10 +6,6 @@ Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignK Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends/CdmEntity -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductId -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductName Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestGroupFkProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestGroupFkProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt index 58af7e7a06..ec1e398a75 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestGroupFkProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestGroupFkProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt @@ -6,12 +6,6 @@ Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProd Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends/CdmEntity -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductId -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductName Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestNestedFkProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestNestedFkProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt index c3364db34b..0e9d939e6f 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestNestedFkProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestNestedFkProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt @@ -14,10 +14,6 @@ Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyPr Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductId -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductName Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestPolymorphicFkProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestPolymorphicFkProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt index 635a1ff340..f7190014d0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestPolymorphicFkProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestPolymorphicFkProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt @@ -6,30 +6,6 @@ Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSo Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/emailId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/address -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/phoneId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/number -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/socialId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/account -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/userId Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt index 0e68c393b3..3fb817b20e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/_generatedAttributeSet_template diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionFK/TestSourceWithEaProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt index ab8e8fee6e..a97f3125d5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt index 03d878aa31..7565883fd2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt @@ -4,22 +4,24 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount/Resolved_Sales/hasAttributes/ThreeProductsBoughtProductCount/(ref) Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt index d6715c3692..51c0b10a5b 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_default.txt index be98618843..1e26c2d143 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_default.txt @@ -5,7 +5,6 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEa/ExpectedOutput/AttrCtx_Color_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEaProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEaProj/ExpectedOutput/AttrCtx_Color_default.txt index 0d47ce3fcd..22ebf8885d 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEaProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEaProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -10,6 +10,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Bl Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt index 2605cff251..a9e2baa382 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,17 +1,13 @@ -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/RGB -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/RGB/Red -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/RGB/Green -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/RGB/Blue -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/RGB/IsGrayscale -Resolved_Color_default/attributeContext/Resolved_Color_default/ColorName -output:/Resolved_Color_default.cdm.json/Resolved_Color_default/attributeContext/Resolved_Color_default/ColorName/Resolved_Color_default/hasAttributes/ColorName/(ref) -output:/Resolved_Color_default.cdm.json/Resolved_Color_default/hasAttributes/ColorName +Resolved_Color/attributeContext/Resolved_Color/RGBColor +Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB +Resolved_Color/attributeContext/Resolved_Color/ColorName +output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) +output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName is.dataFormat.character is.dataFormat.big is.dataFormat.array is.identifiedBy [Parameter (Name / DefaultValue): attribute / this.attribute] - [Argument Value: Resolved_Color_default/(resolvedAttributes)/ColorName] + [Argument Value: Resolved_Color/(resolvedAttributes)/ColorName] is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt index b01303f3b6..3a9f533f8f 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,19 +1,25 @@ -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source/RGB -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source/RGB/Red -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source/RGB/Green -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source/RGB/Blue -Resolved_Color_default/attributeContext/Resolved_Color_default/RGBColor/projection/source/RGB/IsGrayscale -Resolved_Color_default/attributeContext/Resolved_Color_default/ColorName -output:/Resolved_Color_default.cdm.json/Resolved_Color_default/attributeContext/Resolved_Color_default/ColorName/Resolved_Color_default/hasAttributes/ColorName/(ref) -output:/Resolved_Color_default.cdm.json/Resolved_Color_default/hasAttributes/ColorName +Resolved_Color/attributeContext/Resolved_Color/RGBColor +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Green +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale +Resolved_Color/attributeContext/Resolved_Color/ColorName +output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) +output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName is.dataFormat.character is.dataFormat.big is.dataFormat.array is.identifiedBy [Parameter (Name / DefaultValue): attribute / this.attribute] - [Argument Value: Resolved_Color_default/(resolvedAttributes)/ColorName] + [Argument Value: Resolved_Color/(resolvedAttributes)/ColorName] is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt index 50305e8aa7..37d015bfd5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,6 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/extends Resolved_Color/attributeContext/Resolved_Color/extends/RGB -Resolved_Color/attributeContext/Resolved_Color/extends/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt index aeace0b5f7..9ac59f31dd 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -8,6 +8,7 @@ Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/Blu Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt index fbcfdd01d7..3eb421bd9a 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt @@ -1,12 +1,9 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Blue -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt index e5384d5c2b..e48ae8c044 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt @@ -12,9 +12,14 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/sourc Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Blue +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorGreen +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorIsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed output:/Resolved_Product.cdm.json/Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed/Resolved_Product/hasAttributes/RGBColorRed/(ref) Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorBlue diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested1Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested1Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 1dc4c8a2be..5c569d0d07 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested1Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested1Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested2Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested2Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 666afef429..0c63cfe79d 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested2Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested2Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested3Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested3Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index ad53e24427..951fab6abe 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested3Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNested3Of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt index 376e456b6a..b633133155 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -13,9 +13,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Blue diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt index dccb87fae9..cac7796e75 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt @@ -6,28 +6,19 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt index 06cc3332e2..dac5f713c5 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -14,7 +14,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId @@ -23,7 +26,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId @@ -32,9 +38,17 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address/Resolved_Person/hasAttributes/address/(ref) Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 2e18a46eed..c2c21e4a44 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 5a6f7c15c7..9041edb2de 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index bbe19ae0b1..3918bddf01 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9e61059ac5..fbb20f9752 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 87814dadf3..f524413365 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fb1d9ada27..486536056a 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6726bb4db2..b4a66a23bd 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 268ac036c4..f35d5b47f7 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 8fa72f3167..44527c5129 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -17,12 +15,19 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/PersonInfo--Name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/PersonInfo--Age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/PersonInfo--Address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email/PersonInfo--Email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name/Resolved_NewPerson/hasAttributes/PersonInfo--Name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 415417f2cf..5879d287e1 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index e3a281f24d..8dfa526d62 100644 --- a/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/Python/tests/testdata/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index 3aa72deebc..a440fca681 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,name,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,number,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index bbdf2b7560..7562f5c719 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Address.cdm.json/Address,name,something_Address] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Phone.cdm.json/Phone,number,something_Phone] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 94997e5824..83436a8455 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,11 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -25,6 +20,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -37,6 +38,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt index be6fe66d8a..cf2989287d 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 73db8ce2d9..dc4b8c111e 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -8,11 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/proje Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -29,6 +24,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -41,6 +42,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt index 3006759dc1..d34d706446 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt @@ -2,24 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -38,6 +20,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,isPrimary,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,isPrimary,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,isPrimary,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -52,6 +40,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,userId,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,userId,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,userId,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt index 82607e3c41..5e2521d4aa 100644 --- a/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/Python/tests/testdata/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt new file mode 100644 index 0000000000..ff26b6ceb0 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt @@ -0,0 +1,44 @@ +Resolved_Sales/attributeContext/Resolved_Sales/extends +Resolved_Sales/attributeContext/Resolved_Sales/extends/CdmEntity +Resolved_Sales/attributeContext/Resolved_Sales/SalesName +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SalesName/Resolved_Sales/hasAttributes/SalesName/(ref) +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_Sales/hasAttributes/FKId1/(ref) +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/SalesName +is.dataFormat.numeric.shaped + [Parameter (Name / DefaultValue): precision / ] + [Argument Value: 15] + [Parameter (Name / DefaultValue): scale / ] + [Argument Value: -1] +has.description + [Parameter (Name / DefaultValue): description / ] + [Argument Value: en,testing purpose trait on a type attribute.] +means.idea.project +means.idea.scenario +is.dataFormat.numeric.shaped +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/FKId1 +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.guid +means.identity.entityId +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] +means.idea.project +means.idea.scenario +is.dataFormat.guid +is.dataFormat.character +is.dataFormat.array diff --git a/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json new file mode 100644 index 0000000000..c45eaa3b90 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Product", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "purpose": "hasA", + "dataType": "integer", + "name": "ProductId1" + }, + { + "purpose": "hasA", + "dataType": "string", + "name": "ProductName" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json new file mode 100644 index 0000000000..ad4113ca02 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json @@ -0,0 +1,125 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Sales", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "dataType": { + "dataTypeReference": "decimal", + "appliedTraits": [ + { + "traitReference": "is.dataFormat.numeric.shaped", + "arguments": [ + { + "name": "precision", + "value": "15" + }, + { + "name": "scale", + "value": "-1" + } + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "has.description", + "arguments": [ + { + "entityReference": { + "entityShape": "localizedTable", + "constantValues": [ + [ + "en", + "testing purpose trait on a type attribute." + ] + ] + } + } + ] + } + ] + }, + "name": "SalesName" + }, + { + "name": "SaleEAKey", + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "means.forward", + "arguments": [ + "Description for the forward direction in the relationship." + ] + }, + { + "traitReference": "means.backward", + "arguments": [ + "Description for the backward direction in the relationship." + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "entity": { + "source": "Product", + "operations": [ + { + "$type": "replaceAsForeignKey", + "reference": "ProductId1", + "replaceWith": { + "dataType": "entityId", + "name": "FKId1" + } + } + ] + } + } + ], + "version": "1.0" + }, + { + "traitName": "means.backward", + "explanation": "the attribute represents B->A.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship B->A", + "required": false + } + ] + }, + { + "traitName": "means.forward", + "explanation": "the attribute represents A->B.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship A->B", + "required": false + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json new file mode 100644 index 0000000000..4cd76e31b8 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "Product.cdm.json" + }, + { + "corpusPath": "Sales.cdm.json" + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json new file mode 100644 index 0000000000..d06466170d --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json @@ -0,0 +1,25 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "manifestName": "default.manifest.cdm.json", + "entities": [ + { + "type": "LocalEntity", + "entityName": "Product", + "entityPath": "Product.cdm.json/Product" + }, + { + "type": "LocalEntity", + "entityName": "Sales", + "entityPath": "Sales.cdm.json/Sales" + } + ], + "relationships": [ + { + "fromEntity": "Sales.cdm.json/Sales", + "fromEntityAttribute": "FKId1", + "toEntity": "Product.cdm.json/Product", + "toEntityAttribute": "ProductId1" + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json index 88d5936917..40d69df432 100644 --- a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json @@ -103,21 +103,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json index fba7d3d38e..5d22e6ac8a 100644 --- a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json index ec998ece7a..d6ac286d5a 100644 --- a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json new file mode 100644 index 0000000000..1a293e720c --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "BaseEntity", + "hasAttributes": [ + { + "name": "email", + "dataType": "string" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json new file mode 100644 index 0000000000..ac2905871f --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json new file mode 100644 index 0000000000..a17c5abad9 --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "extendsEntity": "BaseEntity", + "extendsEntityResolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + }, + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json new file mode 100644 index 0000000000..d04d2cd88e --- /dev/null +++ b/objectModel/Python/tests/testdata/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "dataType": "string", + "resolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json index 2c3c2dc79b..78df83e540 100644 --- a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json +++ b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Account.cdm.json @@ -1589,7 +1589,7 @@ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Account/(resolvedAttributes)/stateCode" + "resolvedFrom/base_Address/Account/(resolvedAttributes)/stateCode" ] } ] @@ -1600,30 +1600,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1638,12 +1614,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1658,48 +1628,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1809,150 +1737,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "Account/attributeContext/Account/extends/base_Account/Account/extends/base_Account/Account/extends/base_Account/Account/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json index 932dd18460..9af3e9bdef 100644 --- a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json +++ b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/Contact.cdm.json @@ -1682,30 +1682,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "telephone2", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone2" - }, - { - "type": "attributeDefinition", - "name": "telephone3", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone3" - }, - { - "type": "attributeDefinition", - "name": "fax", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/fax" - }, - { - "type": "attributeDefinition", - "name": "versionNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/versionNumber" - }, { "type": "attributeDefinition", "name": "User_createdBy", @@ -1720,12 +1696,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "createdOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/createdOn" - }, { "type": "attributeDefinition", "name": "User_modifiedBy", @@ -1740,48 +1710,6 @@ } ] }, - { - "type": "attributeDefinition", - "name": "modifiedOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/modifiedOn" - }, - { - "type": "attributeDefinition", - "name": "shippingMethodCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/shippingMethodCode" - }, - { - "type": "attributeDefinition", - "name": "owningBusinessUnit", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningBusinessUnit" - }, - { - "type": "attributeDefinition", - "name": "timeZoneRuleVersionNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/timeZoneRuleVersionNumber" - }, - { - "type": "attributeDefinition", - "name": "overriddenCreatedOn", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/overriddenCreatedOn" - }, - { - "type": "attributeDefinition", - "name": "UTCConversionTimeZoneCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCConversionTimeZoneCode" - }, - { - "type": "attributeDefinition", - "name": "importSequenceNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/importSequenceNumber" - }, { "type": "attributeDefinition", "name": "ownerIdAttribute", @@ -1891,150 +1819,6 @@ ] } ] - }, - { - "type": "attributeDefinition", - "name": "owningUser", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/owningUser" - }, - { - "type": "attributeDefinition", - "name": "exchangeRate", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/exchangeRate" - }, - { - "type": "attributeDefinition", - "name": "longitude", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/longitude" - }, - { - "type": "attributeDefinition", - "name": "latitude", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/latitude" - }, - { - "type": "attributeDefinition", - "name": "customerAddressId", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/customerAddressId" - }, - { - "type": "attributeDefinition", - "name": "addressNumber", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressNumber" - }, - { - "type": "attributeDefinition", - "name": "objectTypeCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/objectTypeCode" - }, - { - "type": "attributeDefinition", - "name": "addressTypeCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/addressTypeCode" - }, - { - "type": "attributeDefinition", - "name": "name", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/name" - }, - { - "type": "attributeDefinition", - "name": "primaryContactName", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/primaryContactName" - }, - { - "type": "attributeDefinition", - "name": "line1", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line1" - }, - { - "type": "attributeDefinition", - "name": "line2", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line2" - }, - { - "type": "attributeDefinition", - "name": "telephone1", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/telephone1" - }, - { - "type": "attributeDefinition", - "name": "line3", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/line3" - }, - { - "type": "attributeDefinition", - "name": "stateOrProvince", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/stateOrProvince" - }, - { - "type": "attributeDefinition", - "name": "county", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/county" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/country" - }, - { - "type": "attributeDefinition", - "name": "postOfficeBox", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postOfficeBox" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/postalCode" - }, - { - "type": "attributeDefinition", - "name": "UTCOffset", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UTCOffset" - }, - { - "type": "attributeDefinition", - "name": "freightTermsCode", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/freightTermsCode" - }, - { - "type": "attributeDefinition", - "name": "UPSZone", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/UPSZone" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/city" - }, - { - "type": "attributeDefinition", - "name": "composite", - "parent": "Contact/attributeContext/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/extends/base_Contact/Contact/attributesAddedAtThisScope/attributesAddedAtThisScope/address/customerAddressInline/customerAddressAll/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/base_Address/Address/hasAttributes/attributesAddedAtThisScope/members/composite" } ] } diff --git a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json index ec6641a682..f5460d76f4 100644 --- a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json +++ b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/EmrAppointment.cdm.json @@ -847,20 +847,26 @@ }, { "type": "attributeDefinition", - "name": "campaignOption", + "name": "campaignActivityOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/campaignOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/campaignActivityOption", "contents": [ { "type": "entity", - "name": "Campaign", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/campaignOption", - "definition": "resolvedFrom/Campaign", + "name": "CampaignActivity", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/campaignActivityOption", + "definition": "resolvedFrom/CampaignActivity", "appliedTraits": [ + { + "traitReference": "is.ordered", + "arguments": [ + "resolvedFrom/CampaignActivity/(resolvedAttributes)/sortDate" + ] + }, { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Campaign/(resolvedAttributes)/stateCode" + "resolvedFrom/CampaignActivity/(resolvedAttributes)/stateCode" ] } ] @@ -869,20 +875,20 @@ }, { "type": "attributeDefinition", - "name": "invoiceOption", + "name": "entitlementOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/invoiceOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/entitlementOption", "contents": [ { "type": "entity", - "name": "Invoice", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/invoiceOption", - "definition": "resolvedFrom/Invoice", + "name": "Entitlement", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/entitlementOption", + "definition": "resolvedFrom/Entitlement", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Invoice/(resolvedAttributes)/stateCode" + "resolvedFrom/Entitlement/(resolvedAttributes)/stateCode" ] } ] @@ -891,48 +897,20 @@ }, { "type": "attributeDefinition", - "name": "siteOption", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/siteOption", - "contents": [ - { - "type": "entity", - "name": "Site", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/siteOption", - "definition": "resolvedFrom/Site" - } - ] - }, - { - "type": "attributeDefinition", - "name": "knowledgeBaseRecordOption", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/knowledgeBaseRecordOption", - "contents": [ - { - "type": "entity", - "name": "KnowledgeBaseRecord", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/knowledgeBaseRecordOption", - "definition": "resolvedFrom/KnowledgeBaseRecord" - } - ] - }, - { - "type": "attributeDefinition", - "name": "bookableResourceBookingHeaderOption", + "name": "caseOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/bookableResourceBookingHeaderOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/caseOption", "contents": [ { "type": "entity", - "name": "BookableResourceBookingHeader", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/bookableResourceBookingHeaderOption", - "definition": "resolvedFrom/BookableResourceBookingHeader", + "name": "Case", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/caseOption", + "definition": "resolvedFrom/Case", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/BookableResourceBookingHeader/(resolvedAttributes)/stateCode" + "resolvedFrom/Case/(resolvedAttributes)/stateCode" ] } ] @@ -941,20 +919,20 @@ }, { "type": "attributeDefinition", - "name": "opportunityOption", + "name": "accountOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/opportunityOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/accountOption", "contents": [ { "type": "entity", - "name": "Opportunity", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/opportunityOption", - "definition": "resolvedFrom/Opportunity", + "name": "Account", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/accountOption", + "definition": "resolvedFrom/Account", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Opportunity/(resolvedAttributes)/stateCode" + "resolvedFrom/Account/(resolvedAttributes)/stateCode" ] } ] @@ -963,20 +941,20 @@ }, { "type": "attributeDefinition", - "name": "contactOption", + "name": "quoteOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/contactOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/quoteOption", "contents": [ { "type": "entity", - "name": "Contact", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/contactOption", - "definition": "resolvedFrom/Contact", + "name": "Quote", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/quoteOption", + "definition": "resolvedFrom/Quote", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Contact/(resolvedAttributes)/stateCode" + "resolvedFrom/Quote/(resolvedAttributes)/stateCode" ] } ] @@ -985,20 +963,20 @@ }, { "type": "attributeDefinition", - "name": "orderOption", + "name": "contractOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/orderOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/contractOption", "contents": [ { "type": "entity", - "name": "Order", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/orderOption", - "definition": "resolvedFrom/Order", + "name": "Contract", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/contractOption", + "definition": "resolvedFrom/Contract", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Order/(resolvedAttributes)/stateCode" + "resolvedFrom/Contract/(resolvedAttributes)/stateCode" ] } ] @@ -1035,20 +1013,20 @@ }, { "type": "attributeDefinition", - "name": "contractOption", + "name": "orderOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/contractOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/orderOption", "contents": [ { "type": "entity", - "name": "Contract", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/contractOption", - "definition": "resolvedFrom/Contract", + "name": "Order", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/orderOption", + "definition": "resolvedFrom/Order", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Contract/(resolvedAttributes)/stateCode" + "resolvedFrom/Order/(resolvedAttributes)/stateCode" ] } ] @@ -1057,20 +1035,20 @@ }, { "type": "attributeDefinition", - "name": "quoteOption", + "name": "contactOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/quoteOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/contactOption", "contents": [ { "type": "entity", - "name": "Quote", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/quoteOption", - "definition": "resolvedFrom/Quote", + "name": "Contact", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/contactOption", + "definition": "resolvedFrom/Contact", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Quote/(resolvedAttributes)/stateCode" + "resolvedFrom/Contact/(resolvedAttributes)/stateCode" ] } ] @@ -1079,20 +1057,20 @@ }, { "type": "attributeDefinition", - "name": "accountOption", + "name": "opportunityOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/accountOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/opportunityOption", "contents": [ { "type": "entity", - "name": "Account", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/accountOption", - "definition": "resolvedFrom/Account", + "name": "Opportunity", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/opportunityOption", + "definition": "resolvedFrom/Opportunity", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Account/(resolvedAttributes)/stateCode" + "resolvedFrom/Opportunity/(resolvedAttributes)/stateCode" ] } ] @@ -1101,20 +1079,20 @@ }, { "type": "attributeDefinition", - "name": "caseOption", + "name": "bookableResourceBookingHeaderOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/caseOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/bookableResourceBookingHeaderOption", "contents": [ { "type": "entity", - "name": "Case", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/caseOption", - "definition": "resolvedFrom/Case", + "name": "BookableResourceBookingHeader", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/bookableResourceBookingHeaderOption", + "definition": "resolvedFrom/BookableResourceBookingHeader", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Case/(resolvedAttributes)/stateCode" + "resolvedFrom/BookableResourceBookingHeader/(resolvedAttributes)/stateCode" ] } ] @@ -1123,20 +1101,48 @@ }, { "type": "attributeDefinition", - "name": "entitlementOption", + "name": "knowledgeBaseRecordOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/entitlementOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/knowledgeBaseRecordOption", "contents": [ { "type": "entity", - "name": "Entitlement", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/entitlementOption", - "definition": "resolvedFrom/Entitlement", + "name": "KnowledgeBaseRecord", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/knowledgeBaseRecordOption", + "definition": "resolvedFrom/KnowledgeBaseRecord" + } + ] + }, + { + "type": "attributeDefinition", + "name": "siteOption", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/siteOption", + "contents": [ + { + "type": "entity", + "name": "Site", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/siteOption", + "definition": "resolvedFrom/Site" + } + ] + }, + { + "type": "attributeDefinition", + "name": "invoiceOption", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/invoiceOption", + "contents": [ + { + "type": "entity", + "name": "Invoice", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/invoiceOption", + "definition": "resolvedFrom/Invoice", "appliedTraits": [ { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/Entitlement/(resolvedAttributes)/stateCode" + "resolvedFrom/Invoice/(resolvedAttributes)/stateCode" ] } ] @@ -1145,26 +1151,20 @@ }, { "type": "attributeDefinition", - "name": "campaignActivityOption", + "name": "campaignOption", "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding", - "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/campaignActivityOption", + "definition": "resolvedFrom/EmrAppointment/hasAttributes/attributesAddedAtThisScope/members/regardingObject/entity/Regarding/hasAttributes/campaignOption", "contents": [ { "type": "entity", - "name": "CampaignActivity", - "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/campaignActivityOption", - "definition": "resolvedFrom/CampaignActivity", + "name": "Campaign", + "parent": "EmrAppointment/attributeContext/EmrAppointment/attributesAddedAtThisScope/attributesAddedAtThisScope/regardingObject/Regarding/campaignOption", + "definition": "resolvedFrom/Campaign", "appliedTraits": [ - { - "traitReference": "is.ordered", - "arguments": [ - "resolvedFrom/CampaignActivity/(resolvedAttributes)/sortDate" - ] - }, { "traitReference": "means.entityState", "arguments": [ - "resolvedFrom/CampaignActivity/(resolvedAttributes)/stateCode" + "resolvedFrom/Campaign/(resolvedAttributes)/stateCode" ] } ] diff --git a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/config.json b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/config.json index 263f5768b4..3c1d97d51a 100644 --- a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/config.json +++ b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/config.json @@ -1,19 +1 @@ -{ - "defaultNamespace": "local", - "adapters": [ - { - "type": "local", - "config": { - "root": "tests\\testdata\\Samples\\TestCreateManifest\\ActualOutput" - }, - "namespace": "local" - }, - { - "type": "local", - "config": { - "root": "../../samples/example-public-standards" - }, - "namespace": "cdm" - } - ] -} \ No newline at end of file +{"defaultNamespace": "local", "adapters": [{"type": "local", "config": {"root": "tests\\testdata\\Samples\\TestCreateManifest\\ActualOutput"}, "namespace": "local"}, {"type": "local", "config": {"root": "../../samples/example-public-standards"}, "namespace": "cdm"}]} \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/default.manifest.cdm.json b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/default.manifest.cdm.json index d7f1a5d762..02d9ee3d12 100644 --- a/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/default.manifest.cdm.json +++ b/objectModel/Python/tests/testdata/Samples/TestCreateManifest/ExpectedOutput/default.manifest.cdm.json @@ -1,4 +1,10 @@ { + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], "manifestName": "default", "entities": [ { @@ -7,7 +13,6 @@ "entityPath": "Account.cdm.json/Account", "dataPartitions": [ { - "name": "Account-data-description", "location": "Account/partition-data.csv", "exhibitsTraits": [ { @@ -23,7 +28,8 @@ } ] } - ] + ], + "name": "Account-data-description" } ] }, @@ -33,7 +39,6 @@ "entityPath": "Address.cdm.json/Address", "dataPartitions": [ { - "name": "Address-data-description", "location": "Address/partition-data.csv", "exhibitsTraits": [ { @@ -49,7 +54,8 @@ } ] } - ] + ], + "name": "Address-data-description" } ] }, @@ -59,7 +65,6 @@ "entityPath": "CarePlan.cdm.json/CarePlan", "dataPartitions": [ { - "name": "CarePlan-data-description", "location": "CarePlan/partition-data.csv", "exhibitsTraits": [ { @@ -75,7 +80,8 @@ } ] } - ] + ], + "name": "CarePlan-data-description" } ] }, @@ -85,7 +91,6 @@ "entityPath": "CodeableConcept.cdm.json/CodeableConcept", "dataPartitions": [ { - "name": "CodeableConcept-data-description", "location": "CodeableConcept/partition-data.csv", "exhibitsTraits": [ { @@ -101,7 +106,8 @@ } ] } - ] + ], + "name": "CodeableConcept-data-description" } ] }, @@ -111,7 +117,6 @@ "entityPath": "Contact.cdm.json/Contact", "dataPartitions": [ { - "name": "Contact-data-description", "location": "Contact/partition-data.csv", "exhibitsTraits": [ { @@ -127,7 +132,8 @@ } ] } - ] + ], + "name": "Contact-data-description" } ] }, @@ -137,7 +143,6 @@ "entityPath": "Device.cdm.json/Device", "dataPartitions": [ { - "name": "Device-data-description", "location": "Device/partition-data.csv", "exhibitsTraits": [ { @@ -153,7 +158,8 @@ } ] } - ] + ], + "name": "Device-data-description" } ] }, @@ -163,7 +169,6 @@ "entityPath": "EmrAppointment.cdm.json/EmrAppointment", "dataPartitions": [ { - "name": "EmrAppointment-data-description", "location": "EmrAppointment/partition-data.csv", "exhibitsTraits": [ { @@ -179,7 +184,8 @@ } ] } - ] + ], + "name": "EmrAppointment-data-description" } ] }, @@ -189,7 +195,6 @@ "entityPath": "Encounter.cdm.json/Encounter", "dataPartitions": [ { - "name": "Encounter-data-description", "location": "Encounter/partition-data.csv", "exhibitsTraits": [ { @@ -205,7 +210,8 @@ } ] } - ] + ], + "name": "Encounter-data-description" } ] }, @@ -215,7 +221,6 @@ "entityPath": "EpisodeOfCare.cdm.json/EpisodeOfCare", "dataPartitions": [ { - "name": "EpisodeOfCare-data-description", "location": "EpisodeOfCare/partition-data.csv", "exhibitsTraits": [ { @@ -231,7 +236,8 @@ } ] } - ] + ], + "name": "EpisodeOfCare-data-description" } ] }, @@ -241,7 +247,6 @@ "entityPath": "Location.cdm.json/Location", "dataPartitions": [ { - "name": "Location-data-description", "location": "Location/partition-data.csv", "exhibitsTraits": [ { @@ -257,413 +262,408 @@ } ] } - ] + ], + "name": "Location-data-description" } ] } ], - "relationships": [ - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "primaryContactId", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "parentAccountId", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "masterId", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "contact1Puropose", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "contact2", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Account.cdm.json/Account", - "fromEntityAttribute": "contact2Puropose", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Address.cdm.json/Address", - "fromEntityAttribute": "parentId", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "parentCustomerId", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId", - "exhibitsTraits": [ - "is.CDS.customer" - ] - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "managingOrganization", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "qualification1Issuer", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Device.cdm.json/Device", - "fromEntityAttribute": "owner", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "regardingObjectId", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "onBehalfOf", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", - "fromEntityAttribute": "organization", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Location.cdm.json/Location", - "fromEntityAttribute": "managingOrganization", - "toEntity": "Account.cdm.json/Account", - "toEntityAttribute": "accountId" - }, - { - "fromEntity": "Address.cdm.json/Address", - "fromEntityAttribute": "parentId", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "CarePlan.cdm.json/CarePlan", - "fromEntityAttribute": "encounterIdentifier", - "toEntity": "Encounter.cdm.json/Encounter", - "toEntityAttribute": "encounterId" - }, - { - "fromEntity": "CarePlan.cdm.json/CarePlan", - "fromEntityAttribute": "episodeOfCare", - "toEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", - "toEntityAttribute": "episodeOfCareId" - }, - { - "fromEntity": "CarePlan.cdm.json/CarePlan", - "fromEntityAttribute": "groupIdentifier", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "CarePlan.cdm.json/CarePlan", - "fromEntityAttribute": "patientIdentifier", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "animalBreed", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "animalGenderStatus", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "animalSpecies", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "communication1Language", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "communication2Language", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "contact1Relationship", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "contact2Relationship", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "link1Type", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "link2Type", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Device.cdm.json/Device", - "fromEntityAttribute": "type", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "particpantType", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "serviceCategory", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "encounterGroupIdentifier", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "encounterPriority", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "hospitalizationAdmitSource", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "hospitalizationDischargeDisposition", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "hospitalizationReadmission", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Location.cdm.json/Location", - "fromEntityAttribute": "physicalType", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Location.cdm.json/Location", - "fromEntityAttribute": "type", - "toEntity": "CodeableConcept.cdm.json/CodeableConcept", - "toEntityAttribute": "codeableConceptId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "masterId", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "parentCustomerId", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId", - "exhibitsTraits": [ - "is.CDS.customer" - ] - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "contact1", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "contact2", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "generalPractioner", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "link1", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Contact.cdm.json/Contact", - "fromEntityAttribute": "link2", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Device.cdm.json/Device", - "fromEntityAttribute": "patient", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "regardingObjectId", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "actorPatient", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "actorPractitioner", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "actorRelatedPerson", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "encounterPatientIdentifier", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "subjectPatient", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", - "fromEntityAttribute": "careManager", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", - "fromEntityAttribute": "patient", - "toEntity": "Contact.cdm.json/Contact", - "toEntityAttribute": "contactId" - }, - { - "fromEntity": "Device.cdm.json/Device", - "fromEntityAttribute": "location", - "toEntity": "Location.cdm.json/Location", - "toEntityAttribute": "locationId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "actorDevice", - "toEntity": "Device.cdm.json/Device", - "toEntityAttribute": "deviceId" - }, - { - "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", - "fromEntityAttribute": "actorLocation", - "toEntity": "Location.cdm.json/Location", - "toEntityAttribute": "locationId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "emrAppointment", - "toEntity": "EmrAppointment.cdm.json/EmrAppointment", - "toEntityAttribute": "activityId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "contextEncounter", - "toEntity": "Encounter.cdm.json/Encounter", - "toEntityAttribute": "encounterId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "contextEpisodeofCare", - "toEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", - "toEntityAttribute": "episodeOfCareId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "encounterParentEncounterIdentifier", - "toEntity": "Encounter.cdm.json/Encounter", - "toEntityAttribute": "encounterId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "hospitalizationDestination", - "toEntity": "Location.cdm.json/Location", - "toEntityAttribute": "locationId" - }, - { - "fromEntity": "Encounter.cdm.json/Encounter", - "fromEntityAttribute": "hospitalizationOrigin", - "toEntity": "Location.cdm.json/Location", - "toEntityAttribute": "locationId" - }, - { - "fromEntity": "Location.cdm.json/Location", - "fromEntityAttribute": "partOf", - "toEntity": "Location.cdm.json/Location", - "toEntityAttribute": "locationId" - } - ], - "jsonSchemaSemanticVersion": "1.2.0", - "imports": [ + "relationships": [ { - "corpusPath": "cdm:/foundations.cdm.json" + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "primaryContactId", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "parentAccountId", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "masterId", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "contact1Puropose", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "contact2", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Account.cdm.json/Account", + "fromEntityAttribute": "contact2Puropose", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Address.cdm.json/Address", + "fromEntityAttribute": "parentId", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "parentCustomerId", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId", + "exhibitsTraits": [ + "is.CDS.customer" + ] + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "managingOrganization", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "qualification1Issuer", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Device.cdm.json/Device", + "fromEntityAttribute": "owner", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "regardingObjectId", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "onBehalfOf", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", + "fromEntityAttribute": "organization", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Location.cdm.json/Location", + "fromEntityAttribute": "managingOrganization", + "toEntity": "Account.cdm.json/Account", + "toEntityAttribute": "accountId" + }, + { + "fromEntity": "Address.cdm.json/Address", + "fromEntityAttribute": "parentId", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "CarePlan.cdm.json/CarePlan", + "fromEntityAttribute": "encounterIdentifier", + "toEntity": "Encounter.cdm.json/Encounter", + "toEntityAttribute": "encounterId" + }, + { + "fromEntity": "CarePlan.cdm.json/CarePlan", + "fromEntityAttribute": "episodeOfCare", + "toEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", + "toEntityAttribute": "episodeOfCareId" + }, + { + "fromEntity": "CarePlan.cdm.json/CarePlan", + "fromEntityAttribute": "groupIdentifier", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "CarePlan.cdm.json/CarePlan", + "fromEntityAttribute": "patientIdentifier", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "animalBreed", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "animalGenderStatus", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "animalSpecies", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "communication1Language", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "communication2Language", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "contact1Relationship", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "contact2Relationship", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "link1Type", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "link2Type", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Device.cdm.json/Device", + "fromEntityAttribute": "type", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "particpantType", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "serviceCategory", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "encounterGroupIdentifier", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "encounterPriority", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "hospitalizationAdmitSource", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "hospitalizationDischargeDisposition", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "hospitalizationReadmission", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Location.cdm.json/Location", + "fromEntityAttribute": "physicalType", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Location.cdm.json/Location", + "fromEntityAttribute": "type", + "toEntity": "CodeableConcept.cdm.json/CodeableConcept", + "toEntityAttribute": "codeableConceptId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "masterId", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "parentCustomerId", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId", + "exhibitsTraits": [ + "is.CDS.customer" + ] + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "contact1", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "contact2", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "generalPractioner", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "link1", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Contact.cdm.json/Contact", + "fromEntityAttribute": "link2", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Device.cdm.json/Device", + "fromEntityAttribute": "patient", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "regardingObjectId", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "actorPatient", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "actorPractitioner", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "actorRelatedPerson", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "encounterPatientIdentifier", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "subjectPatient", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", + "fromEntityAttribute": "careManager", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", + "fromEntityAttribute": "patient", + "toEntity": "Contact.cdm.json/Contact", + "toEntityAttribute": "contactId" + }, + { + "fromEntity": "Device.cdm.json/Device", + "fromEntityAttribute": "location", + "toEntity": "Location.cdm.json/Location", + "toEntityAttribute": "locationId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "actorDevice", + "toEntity": "Device.cdm.json/Device", + "toEntityAttribute": "deviceId" + }, + { + "fromEntity": "EmrAppointment.cdm.json/EmrAppointment", + "fromEntityAttribute": "actorLocation", + "toEntity": "Location.cdm.json/Location", + "toEntityAttribute": "locationId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "emrAppointment", + "toEntity": "EmrAppointment.cdm.json/EmrAppointment", + "toEntityAttribute": "activityId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "contextEncounter", + "toEntity": "Encounter.cdm.json/Encounter", + "toEntityAttribute": "encounterId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "contextEpisodeofCare", + "toEntity": "EpisodeOfCare.cdm.json/EpisodeOfCare", + "toEntityAttribute": "episodeOfCareId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "encounterParentEncounterIdentifier", + "toEntity": "Encounter.cdm.json/Encounter", + "toEntityAttribute": "encounterId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "hospitalizationDestination", + "toEntity": "Location.cdm.json/Location", + "toEntityAttribute": "locationId" + }, + { + "fromEntity": "Encounter.cdm.json/Encounter", + "fromEntityAttribute": "hospitalizationOrigin", + "toEntity": "Location.cdm.json/Location", + "toEntityAttribute": "locationId" + }, + { + "fromEntity": "Location.cdm.json/Location", + "fromEntityAttribute": "partOf", + "toEntity": "Location.cdm.json/Location", + "toEntityAttribute": "locationId" } ] } \ No newline at end of file diff --git a/objectModel/Python/tests/testdata/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json b/objectModel/Python/tests/testdata/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json index 00838d70c8..0b81021bdc 100644 --- a/objectModel/Python/tests/testdata/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json +++ b/objectModel/Python/tests/testdata/Samples/TestLogicalManipulationUsingProjections/ExpectedOutput/referenceOnly_Person.cdm.json @@ -75,33 +75,7 @@ "type": "entity", "name": "Address", "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source", - "definition": "resolvedFrom/Address", - "contents": [ - { - "type": "attributeDefinition", - "name": "addressLine", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/addressLine" - }, - { - "type": "attributeDefinition", - "name": "postalCode", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/postalCode" - }, - { - "type": "attributeDefinition", - "name": "city", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/city" - }, - { - "type": "attributeDefinition", - "name": "country", - "parent": "referenceOnly_Person/attributeContext/referenceOnly_Person/address/projection/source/projection/source/Address", - "definition": "resolvedFrom/Address/hasAttributes/country" - } - ] + "definition": "resolvedFrom/Address" } ] } diff --git a/objectModel/Python/tests/utilities/projection_test_utils.py b/objectModel/Python/tests/utilities/projection_test_utils.py index 7ea30a71ba..0fa3afa918 100644 --- a/objectModel/Python/tests/utilities/projection_test_utils.py +++ b/objectModel/Python/tests/utilities/projection_test_utils.py @@ -4,7 +4,7 @@ import os from typing import List, Optional -from cdm.enums import CdmStatusLevel, CdmObjectType +from cdm.enums import CdmLogCode, CdmObjectType, CdmStatusLevel from cdm.utilities import AttributeResolutionDirectiveSet, ResolveOptions from tests.cdm.projection.attribute_context_util import AttributeContextUtil from tests.common import TestHelper @@ -20,6 +20,11 @@ class ProjectionTestUtils: # Path to foundations foundation_json_path = 'cdm:/foundations.cdm.json' + # The log codes that are allowed to be logged without failing the test + allowed_logs = set([ + CdmLogCode.WARN_DEPRECATED_RESOLUTION_GUIDANCE.name + ]) + @staticmethod async def get_resolved_entity(corpus: 'CdmCorpusDefinition', input_entity: 'CdmEntityDefinition', directives: List[str]) -> 'CdmEntityDefinition': """Resolves an entity""" @@ -51,7 +56,8 @@ def get_resolution_option_name_suffix(directives: List[str], expected_output_pat return file_name_prefix @staticmethod - async def load_entity_for_resolution_option_and_save(test: 'TestCase', corpus: 'CdmCorpusDefinition', test_name: str, tests_subpath: str, entity_name: str, directives: List[str]) -> 'CdmEntityDefinition': + async def load_entity_for_resolution_option_and_save(test: 'TestCase', corpus: 'CdmCorpusDefinition', test_name: str, tests_subpath: str, entity_name: str, \ + directives: List[str], update_expected_output: bool = False) -> 'CdmEntityDefinition': """Loads an entity, resolves it, and then validates the generated attribute contexts""" expected_output_path = TestHelper.get_expected_output_folder_path(tests_subpath, test_name) @@ -60,7 +66,7 @@ async def load_entity_for_resolution_option_and_save(test: 'TestCase', corpus: ' resolved_entity = await ProjectionTestUtils.get_resolved_entity(corpus, entity, directives) test.assertIsNotNone(resolved_entity) - await ProjectionTestUtils.validate_attribute_context(test, directives, expected_output_path, entity_name, resolved_entity) + await ProjectionTestUtils.validate_attribute_context(test, directives, expected_output_path, entity_name, resolved_entity, update_expected_output) return resolved_entity @@ -70,7 +76,9 @@ def get_local_corpus(tests_subpath: str, test_name: str) -> 'CdmCorpusDefinition corpus = TestHelper.get_local_corpus(tests_subpath, test_name) def callback(level: CdmStatusLevel, message: str): - raise Exception(message) + last_event = corpus.ctx.events[-1] + if not last_event.get('code') or last_event['code'] not in ProjectionTestUtils.allowed_logs: + raise Exception(message) corpus.set_event_callback(callback, CdmStatusLevel.WARNING) return corpus diff --git a/objectModel/TypeScript/Cdm/CdmAttribute.ts b/objectModel/TypeScript/Cdm/CdmAttribute.ts index 207f7c6b05..8a035b7d5d 100644 --- a/objectModel/TypeScript/Cdm/CdmAttribute.ts +++ b/objectModel/TypeScript/Cdm/CdmAttribute.ts @@ -27,6 +27,10 @@ export abstract class CdmAttribute extends CdmObjectDefinitionBase implements Cd * @internal */ public attributeCount: number; + /** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ public resolutionGuidance: CdmAttributeResolutionGuidance; /** @@ -153,6 +157,11 @@ export abstract class CdmAttribute extends CdmObjectDefinitionBase implements Cd } // return p.measure(bodyCode); } + + /** + * @deprecated + * For internal use only. + */ public abstract fetchResolvedEntityReference(resOpt: resolveOptions): ResolvedEntityReferenceSet; } diff --git a/objectModel/TypeScript/Cdm/CdmAttributeContext.ts b/objectModel/TypeScript/Cdm/CdmAttributeContext.ts index 98fc59f4ca..5c7cf5139f 100644 --- a/objectModel/TypeScript/Cdm/CdmAttributeContext.ts +++ b/objectModel/TypeScript/Cdm/CdmAttributeContext.ts @@ -353,7 +353,7 @@ export class CdmAttributeContext extends CdmObjectDefinitionBase { // fix up the reference to defintion. need to get path from this document to the // add moniker if this is a reference - if (ac.definition != null) { + if (ac.definition) { ac.definition.inDocument = docHome; if (ac.definition && ac.definition.namedReference) { @@ -446,6 +446,189 @@ export class CdmAttributeContext extends CdmObjectDefinitionBase { return true; } + /** + * @internal + */ + public collectContextFromAtts(rasSub: ResolvedAttributeSet, collected: Set): void { + rasSub.set.forEach(ra => { + const raCtx: CdmAttributeContext = ra.attCtx; + collected.add(raCtx); + + // the target for a resolved att can be a TypeAttribute OR it can be another ResolvedAttributeSet (meaning a group) + if (ra.target instanceof ResolvedAttributeSet) { + // a group + this.collectContextFromAtts(ra.target as ResolvedAttributeSet, collected); + } + }); + } + + /** + * @internal + */ + public pruneToScope(scopeSet: Set): boolean { + // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set + // (so base entity chains, entity attributes entity definitions) + + // for testing, don't delete this + // const countNodes = (subItem) => { + // if (subItem instanceof CdmAttributeContext) { + // return 1; + // } + // const ac: CdmAttributeContext = subItem as CdmAttributeContext; + // if (ac.contents === undefined || ac.contents.length === 0) { + // return 1; + // } + // // look at all children + // let total: number = 0; + // for (const subSub of ac.contents) { + // total += countNodes(subSub); + // } + // return 1 + total; + // }; + // console.log(`Pre Prune ${countNodes(this)}`); + + + // so ... the change from the old behavior is to depend on the lineage pointers to save the attribute defs + // in the 'structure' part of the tree that might matter. keep all of the other structure info and keep some + // special nodes (like the ones that have removed attributes) that won't get found from lineage trace but that are + // needed to understand what took place in resolution + const nodesToSave = new Set(); + + // helper that save the passed node and anything up the parent chain + const saveParentNodes = (currNode: CdmAttributeContext) => { + if (nodesToSave.has(currNode)) { + return true; + } + nodesToSave.add(currNode); + // get the parent + if (currNode.parent?.explicitReference) { + return saveParentNodes(currNode.parent.explicitReference as CdmAttributeContext); + } + return true; + }; + + // helper that saves the current node (and parents) plus anything in the lineage (with their parents) + const saveLineageNodes = (currNode: CdmAttributeContext) => { + if (!saveParentNodes(currNode)) { + return false; + } + if (currNode.lineage && currNode.lineage.length > 0) { + for (const lin of currNode.lineage) { + if (lin.explicitReference) { + if (!saveLineageNodes(lin.explicitReference as CdmAttributeContext)) { + return false; + } + } + } + } + return true; + }; + + + const saveStructureNodes = (subItem: CdmObject, inGenerated: boolean, inProjection: boolean, inRemove: boolean) => { + if (!(subItem instanceof CdmAttributeContext)) { + return true; + } + + const ac: CdmAttributeContext = subItem as CdmAttributeContext; + if (ac.type === cdmAttributeContextType.generatedSet) { + inGenerated = true; // special mode where we hate everything except the removed att notes + } + + if (inGenerated && (ac.type === cdmAttributeContextType.operationExcludeAttributes || ac.type === cdmAttributeContextType.operationIncludeAttributes)) { + inRemove = true; // triggers us to know what to do in the next code block. + } + let removedAttribute: boolean = false; + if (ac.type == cdmAttributeContextType.attributeDefinition) { + // empty attribute nodes are descriptions of source attributes that may or may not be needed. lineage will sort it out. + // the exception is for attribute descriptions under a remove attributes operation. they are gone from the resolved att set, so + // no history would remain + if (inRemove) { + removedAttribute = true; + } else if (!ac.contents || ac.contents.length === 0) { + return true; + } + } + + if (!inGenerated || removedAttribute) { + // mark this as something worth saving, sometimes + // these get discovered at the leaf of a tree that we want to mostly ignore, so can cause a + // discontinuity in the 'save' chains, so fix that + saveLineageNodes(ac); + } + + if (ac.type === cdmAttributeContextType.projection) { + inProjection = true; // track this so we can do the next thing ... + } + if (ac.type === cdmAttributeContextType.entity && inProjection) { + // this is far enough, the entity that is somewhere under a projection chain + // things under this might get saved through lineage, but down to this point will get in for sure + return true; + } + + if (!ac.contents|| ac.contents.length === 0) { + return true; + } + // look at all children + for (const subSub of ac.contents) { + if (!saveStructureNodes(subSub, inGenerated, inProjection, inRemove)) { + return false; + } + } + return true; + }; + + if (!saveStructureNodes(this, false, false, false)) { + return false; + } + + // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save + // also mark any parents of those as savers + + + // so, do that ^^^ for every primary context found earlier + for (const primCtx of scopeSet) { + if (!saveLineageNodes(primCtx)) { + return false; + } + } + + // now the cleanup, we have a set of the nodes that should be saved + // run over the tree and re-build the contents collection with only the things to save + const cleanSubGroup = (subItem: CdmObject) => { + if (subItem.objectType === cdmObjectType.attributeRef) { + return true; // not empty + } + + const ac: CdmAttributeContext = subItem as CdmAttributeContext; + + if (!nodesToSave.has(ac)) { + return false; // don't even look at content, this all goes away + } + + if (ac.contents && ac.contents.length > 0) { + // need to clean up the content array without triggering the code that fixes in document or paths + const newContent: CdmObject[] = []; + for (const sub of ac.contents) { + // true means keep this as a child + if (cleanSubGroup(sub)) { + newContent.push(sub); + } + } + // clear the old content and replace + ac.contents.clear(); + ac.contents.allItems.push(...newContent); + } + + return true; + }; + cleanSubGroup(this); + + // console.log(`Post Prune ${countNodes(this)}`); + + return true; + } + /** * @internal */ diff --git a/objectModel/TypeScript/Cdm/CdmAttributeGroupDefinition.ts b/objectModel/TypeScript/Cdm/CdmAttributeGroupDefinition.ts index d977c679c1..96f4aa63df 100644 --- a/objectModel/TypeScript/Cdm/CdmAttributeGroupDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmAttributeGroupDefinition.ts @@ -228,6 +228,10 @@ export class CdmAttributeGroupDefinition extends CdmObjectDefinitionBase { // return p.measure(bodyCode); } + /** + * @deprecated + * For internal use only. + */ public fetchResolvedEntityReference(resOpt: resolveOptions): ResolvedEntityReferenceSet { // let bodyCode = () => { diff --git a/objectModel/TypeScript/Cdm/CdmAttributeGroupReference.ts b/objectModel/TypeScript/Cdm/CdmAttributeGroupReference.ts index 9511d984c7..5be72199ae 100644 --- a/objectModel/TypeScript/Cdm/CdmAttributeGroupReference.ts +++ b/objectModel/TypeScript/Cdm/CdmAttributeGroupReference.ts @@ -67,6 +67,10 @@ export class CdmAttributeGroupReference extends CdmObjectReferenceBase implement // return p.measure(bodyCode); } + /** + * @deprecated + * For internal use only. + */ public fetchResolvedEntityReference(resOpt?: resolveOptions): ResolvedEntityReferenceSet { // let bodyCode = () => { diff --git a/objectModel/TypeScript/Cdm/CdmAttributeResolutionGuidance.ts b/objectModel/TypeScript/Cdm/CdmAttributeResolutionGuidance.ts index fd7c6dde39..ca07042c7b 100644 --- a/objectModel/TypeScript/Cdm/CdmAttributeResolutionGuidance.ts +++ b/objectModel/TypeScript/Cdm/CdmAttributeResolutionGuidance.ts @@ -11,6 +11,10 @@ import { VisitCallback } from '../internal'; +/** + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview + */ export class CdmAttributeResolutionGuidance extends cdmObjectSimple implements CdmAttributeResolutionGuidance { public removeAttribute?: boolean; /** diff --git a/objectModel/TypeScript/Cdm/CdmCorpusDefinition.ts b/objectModel/TypeScript/Cdm/CdmCorpusDefinition.ts index bb786bf8cd..59c3b465f9 100644 --- a/objectModel/TypeScript/Cdm/CdmCorpusDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmCorpusDefinition.ts @@ -535,9 +535,20 @@ export class CdmCorpusDefinition { let tagSuffix: string = `-${kind}-${thisId}`; tagSuffix += `-(${resOpt.directives ? resOpt.directives.getTag() : ''})`; - if (resOpt.depthInfo.maxDepthExceeded) { - const currDepthInfo: DepthInfo = resOpt.depthInfo; - tagSuffix += `-${currDepthInfo.maxDepth - currDepthInfo.currentDepth}`; + // only for attributes + if (kind === 'rasb') { + // if MaxDepth was not initialized before, initialize it now + if (resOpt.depthInfo.maxDepth === undefined) { + resOpt.depthInfo.maxDepth = resOpt.maxDepth; + } + + // add to the cache tag either if we reached maximum depth or how many levels we can go down until reaching the maximum depth + if (resOpt.depthInfo.currentDepth > resOpt.depthInfo.maxDepth) { + tagSuffix += '-overMaxDepth'; + } else { + const currDepthInfo: DepthInfo = resOpt.depthInfo; + tagSuffix += `-${currDepthInfo.maxDepth - currDepthInfo.currentDepth}toMaxDepth`; + } } if (resOpt.inCircularReference) { tagSuffix += '-pk'; diff --git a/objectModel/TypeScript/Cdm/CdmEntityAttributeDefinition.ts b/objectModel/TypeScript/Cdm/CdmEntityAttributeDefinition.ts index d76407d546..c8503f1308 100644 --- a/objectModel/TypeScript/Cdm/CdmEntityAttributeDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmEntityAttributeDefinition.ts @@ -266,9 +266,13 @@ export class CdmEntityAttributeDefinition extends CdmAttribute { const projDirective: ProjectionDirective = new ProjectionDirective(resOpt, this, this.entity); const projCtx: ProjectionContext = projDef.constructProjectionContext(projDirective, under); rasb.ras = projDef.extractResolvedAttributes(projCtx, under); + // from the traits of purpose and applied here + rasb.ras.applyTraits(this.fetchResolvedTraits(resOpt)); } } else { - // An Entity Reference + // Resolution guidance + + resOpt.usedResolutionGuidance = true; const arc: AttributeResolutionContext = this.fetchAttResContext(resOpt); const relInfo: relationshipInfo = arc.getRelationshipInfo(); @@ -446,6 +450,10 @@ export class CdmEntityAttributeDefinition extends CdmAttribute { // return p.measure(bodyCode); } + /** + * @deprecated + * For internal use only. + */ // the only thing we need this code for is testing!!! public fetchResolvedEntityReference(resOpt?: resolveOptions): ResolvedEntityReferenceSet { // let bodyCode = () => diff --git a/objectModel/TypeScript/Cdm/CdmEntityDefinition.ts b/objectModel/TypeScript/Cdm/CdmEntityDefinition.ts index 62e0271406..864c87e9cc 100644 --- a/objectModel/TypeScript/Cdm/CdmEntityDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmEntityDefinition.ts @@ -115,6 +115,8 @@ export class CdmEntityDefinition extends CdmObjectDefinitionBase { /** * The resolution guidance for attributes taken from the entity extended by this entity. + * @deprecated + * Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview */ public extendsEntityResolutionGuidance?: CdmAttributeResolutionGuidance; private rasb: ResolvedAttributeSetBuilder; @@ -410,6 +412,8 @@ export class CdmEntityDefinition extends CdmObjectDefinitionBase { } if (this.extendsEntityResolutionGuidance) { + resOpt.usedResolutionGuidance = true; + /** * some guidance was given on how to integrate the base attributes into the set. Apply that guidance */ @@ -682,6 +686,10 @@ export class CdmEntityDefinition extends CdmObjectDefinitionBase { // points to the level of the context where it was last modified, merged, created const ras: ResolvedAttributeSet = this.fetchResolvedAttributes(resOptCopy, acpEnt); + if (resOptCopy.usedResolutionGuidance) { + Logger.warning(ctx, this.TAG, this.createResolvedEntityAsync.name, this.atCorpusPath, cdmLogCode.WarnDeprecatedResolutionGuidance); + } + if (ras === undefined) { return undefined; } @@ -795,104 +803,11 @@ export class CdmEntityDefinition extends CdmObjectDefinitionBase { // do this by keeping the leafs and all of the lineage nodes for the attributes that end up in the resolved entity // along with some special nodes that explain entity structure and inherit - // run over the whole tree and make a set of the nodes that should be saved for sure. This is anything NOT under a generated set - // (so base entity chains, entity attributes entity definitions) - const nodesToSave: Set = new Set(); - const saveStructureNodes: (subItem: CdmObject) => boolean - = (subItem: CdmObject): boolean => { - const ac: CdmAttributeContext = subItem as CdmAttributeContext; - if (!ac || ac.type === cdmAttributeContextType.generatedSet) { - return true; - } - nodesToSave.add(ac); - if (!ac.contents || ac.contents.length === 0) { - return true; - } - // look at all children - for (const subSub of ac.contents) { - if (!saveStructureNodes(subSub)) { - return false; - } - } - return true; - }; - if (!saveStructureNodes(attCtx)) { + if (!attCtx.pruneToScope(allPrimaryCtx)) { + // TODO: log error return undefined; } - // next, look at the attCtx for every resolved attribute. follow the lineage chain and mark all of those nodes as ones to save - // also mark any parents of those as savers - - // helper that save the passed node and anything up the parent chain - const saveParentNodes: (currNode: CdmAttributeContext) => boolean - = (currNode: CdmAttributeContext): boolean => { - if (nodesToSave.has(currNode)) { - return true; - } - nodesToSave.add(currNode); - // get the parent - if (currNode.parent && currNode.parent.explicitReference) { - return saveParentNodes(currNode.parent.explicitReference as CdmAttributeContext); - } - return true; - }; - - // helper that saves the current node (and parents) plus anything in the lineage (with their parents) - const saveLineageNodes: (currNode: CdmAttributeContext) => boolean - = (currNode: CdmAttributeContext): boolean => { - if (!saveParentNodes(currNode)) { - return false; - } - if (currNode.lineage && currNode.lineage.length > 0) { - for (const lin of currNode.lineage) { - if (lin.explicitReference) { - if (!saveLineageNodes(lin.explicitReference as CdmAttributeContext)) { - return false; - } - } - } - } - return true; - }; - - // so, do that ^^^ for every primary context found earlier - for (const primCtx of allPrimaryCtx) { - if (!saveLineageNodes(primCtx)) { - return undefined; - } - } - - // now the cleanup, we have a set of the nodes that should be saved - // run over the tree and re-build the contents collection with only the things to save - const cleanSubGroup: (subItem: CdmObject) => boolean = - (subItem: CdmObject) => { - if (subItem.objectType === cdmObjectType.attributeRef) { - return true; // not empty - } - - const ac: CdmAttributeContext = subItem as CdmAttributeContext; - - if (!nodesToSave.has(ac)) { - return false; // don't even look at content, this all goes away - } - - if (ac.contents && ac.contents.length > 0) { - // need to clean up the content array without triggering the code that fixes in document or paths - const newContent: CdmObject[] = []; - for (const sub of ac.contents) { - // true means keep this as a child - if (cleanSubGroup(sub)) { - newContent.push(sub); - } - } - // clear the old content and replace - ac.contents.allItems = Object.assign([], newContent); - } - - return true; - }; - cleanSubGroup(attCtx); - // create an all-up ordering of attributes at the leaves of this tree based on insert order // sort the attributes in each context by their creation order and mix that with the other sub-contexts that have been sorted let getOrderNum: (item: CdmObject) => number; diff --git a/objectModel/TypeScript/Cdm/CdmManifestDefinition.ts b/objectModel/TypeScript/Cdm/CdmManifestDefinition.ts index 41b02c0337..3d1d8d2078 100644 --- a/objectModel/TypeScript/Cdm/CdmManifestDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmManifestDefinition.ts @@ -20,6 +20,7 @@ import { cdmObjectType, cdmRelationshipDiscoveryStyle, CdmTraitCollection, + CdmTraitReferenceBase, copyOptions, importsLoadStrategy, Logger, @@ -134,19 +135,19 @@ export class CdmManifestDefinition extends CdmDocumentDefinition implements CdmO copy.entities.clear(); for (const ent of this.entities) { - copy.entities.push(ent); + copy.entities.push(ent.copy(resOpt) as CdmEntityDeclarationDefinition); } copy.relationships.clear(); for (const rel of this.relationships) { - copy.relationships.push(rel); + copy.relationships.push(rel.copy(resOpt) as CdmE2ERelationship); } copy.subManifests.clear(); for (const man of this.subManifests) { - copy.subManifests.push(man); + copy.subManifests.push(man.copy(resOpt) as CdmManifestDeclarationDefinition); } copy.exhibitsTraits.clear(); for (const et of this.exhibitsTraits) { - copy.exhibitsTraits.push(et); + copy.exhibitsTraits.push(et.copy(resOpt) as CdmTraitReferenceBase); } return copy; diff --git a/objectModel/TypeScript/Cdm/CdmObjectBase.ts b/objectModel/TypeScript/Cdm/CdmObjectBase.ts index 7ea62f999a..7e1ec2eb4e 100644 --- a/objectModel/TypeScript/Cdm/CdmObjectBase.ts +++ b/objectModel/TypeScript/Cdm/CdmObjectBase.ts @@ -333,6 +333,18 @@ export abstract class CdmObjectBase implements CdmObject { if (odef !== undefined) { ctx.corpus.registerDefinitionReferenceSymbols(odef, kind, resOpt.symbolRefSet); + if (this.objectType === cdmObjectType.entityDef) { + // if we just got attributes for an entity, take the time now to clean up this cached tree and prune out + // things that don't help explain where the final set of attributes came from + if (underCtx) { + const scopesForAttributes = new Set(); + underCtx.collectContextFromAtts(rasbCache.ras, scopesForAttributes); // the context node for every final attribute + if (!underCtx.pruneToScope(scopesForAttributes)) { + return undefined; + } + } + } + // get the new cache tag now that we have the list of docs const cacheTag: string = ctx.corpus.createDefinitionCacheTag(resOpt, this, kind, acpInContext ? 'ctx' : undefined); // save this as the cached version diff --git a/objectModel/TypeScript/Cdm/CdmObjectReferenceBase.ts b/objectModel/TypeScript/Cdm/CdmObjectReferenceBase.ts index 942d3d3406..74384dbccc 100644 --- a/objectModel/TypeScript/Cdm/CdmObjectReferenceBase.ts +++ b/objectModel/TypeScript/Cdm/CdmObjectReferenceBase.ts @@ -329,10 +329,8 @@ export abstract class CdmObjectReferenceBase extends CdmObjectBase implements Cd } let def: T = this.fetchResolvedReference(resOpt) as unknown as T; - if (def !== undefined) { - if (isCdmObjectReference(def)) { - def = def.fetchResolvedReference() as unknown as T; - } + if (def !== undefined && isCdmObjectReference(def)) { + def = def.fetchResolvedReference() as unknown as T; } if (def !== undefined && !isCdmObjectReference(def)) { return def; diff --git a/objectModel/TypeScript/Cdm/CdmReferencesEntities.ts b/objectModel/TypeScript/Cdm/CdmReferencesEntities.ts index 89718022f0..4edbea0c37 100644 --- a/objectModel/TypeScript/Cdm/CdmReferencesEntities.ts +++ b/objectModel/TypeScript/Cdm/CdmReferencesEntities.ts @@ -4,5 +4,9 @@ import { ResolvedEntityReferenceSet , resolveOptions } from '../internal'; export interface CdmReferencesEntities { + /** + * @deprecated + * For internal use only. + */ fetchResolvedEntityReference(resOpt: resolveOptions): ResolvedEntityReferenceSet; } diff --git a/objectModel/TypeScript/Cdm/CdmTypeAttributeDefinition.ts b/objectModel/TypeScript/Cdm/CdmTypeAttributeDefinition.ts index a68ec5d1b7..a2bb320cec 100644 --- a/objectModel/TypeScript/Cdm/CdmTypeAttributeDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmTypeAttributeDefinition.ts @@ -364,6 +364,7 @@ export class CdmTypeAttributeDefinition extends CdmAttribute { // make a copy and add defaults if missing let resGuideWithDefault: CdmAttributeResolutionGuidance; if (this.resolutionGuidance !== undefined) { + resOpt.usedResolutionGuidance = true; resGuideWithDefault = this.resolutionGuidance.copy(resOpt) as CdmAttributeResolutionGuidance; } else { resGuideWithDefault = new CdmAttributeResolutionGuidance(this.ctx); @@ -387,6 +388,10 @@ export class CdmTypeAttributeDefinition extends CdmAttribute { // return p.measure(bodyCode); } + /** + * @deprecated + * For internal use only. + */ public fetchResolvedEntityReference(resOpt: resolveOptions): ResolvedEntityReferenceSet { // let bodyCode = () => { diff --git a/objectModel/TypeScript/Enums/cdmLogCode.ts b/objectModel/TypeScript/Enums/cdmLogCode.ts index b0f97dd644..3d9f6b2447 100644 --- a/objectModel/TypeScript/Enums/cdmLogCode.ts +++ b/objectModel/TypeScript/Enums/cdmLogCode.ts @@ -113,6 +113,7 @@ export enum cdmLogCode { ErrUnrecognizedType, // Warnings WarnPartitionGlobAndRegexPresent, + WarnDeprecatedResolutionGuidance, WarnDocChangesDiscarded, WarnDocImportNotLoaded, WarnPartitionFileFetchFailed, diff --git a/objectModel/TypeScript/Utilities/resolveOptions.ts b/objectModel/TypeScript/Utilities/resolveOptions.ts index 2449eb7f6b..ecea8982f5 100644 --- a/objectModel/TypeScript/Utilities/resolveOptions.ts +++ b/objectModel/TypeScript/Utilities/resolveOptions.ts @@ -69,6 +69,12 @@ export class resolveOptions { */ public currentlyResolvingEntities: Set; // moniker that was found on the ref + /** + * Indicates if resolution guidance was used at any point during resolution + * @internal + */ + public usedResolutionGuidance: boolean = false; + /** * @deprecated please use importsLoadStrategy instead. * when enabled, all the imports will be loaded and the references checked otherwise will be delayed until the symbols are required. @@ -167,6 +173,7 @@ export class resolveOptions { resOptCopy.importsLoadStrategy = this.importsLoadStrategy; resOptCopy.saveResolutionsOnCopy = this.saveResolutionsOnCopy; resOptCopy.currentlyResolvingEntities = new Set(this.currentlyResolvingEntities); + resOptCopy.usedResolutionGuidance = this.usedResolutionGuidance; return resOptCopy; } diff --git a/objectModel/TypeScript/Utilities/traitToPropertyMap.ts b/objectModel/TypeScript/Utilities/traitToPropertyMap.ts index 96abf571df..5ea1b96ee4 100644 --- a/objectModel/TypeScript/Utilities/traitToPropertyMap.ts +++ b/objectModel/TypeScript/Utilities/traitToPropertyMap.ts @@ -597,7 +597,7 @@ export class traitToPropertyMap { } if (defVal.getObjectType() === cdmObjectType.entityRef) { // no doc or directives should work ? - const cEnt: CdmConstantEntityDefinition = defVal.fetchObjectDefinition(undefined) as CdmConstantEntityDefinition; + const cEnt: CdmConstantEntityDefinition = defVal.fetchObjectDefinition() as CdmConstantEntityDefinition; if (cEnt) { const esName: string = cEnt.getEntityShape() diff --git a/objectModel/TypeScript/__test__/Cdm/ManifestDefinition.test.ts b/objectModel/TypeScript/__test__/Cdm/ManifestDefinition.test.ts new file mode 100644 index 0000000000..07c50d65ba --- /dev/null +++ b/objectModel/TypeScript/__test__/Cdm/ManifestDefinition.test.ts @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +import { + CdmCorpusDefinition, + CdmEntityDeclarationDefinition, + CdmE2ERelationship, + CdmManifestDeclarationDefinition, + CdmManifestDefinition, + CdmTraitReferenceBase +} from '../../internal'; + +describe('Cdm/ManifestDefinitionTests', () => { + /** + * Tests if the copy function creates copies of the sub objects + */ + it('testManifestCopy', () => { + const corpus: CdmCorpusDefinition = new CdmCorpusDefinition(); + const manifest: CdmManifestDefinition = new CdmManifestDefinition(corpus.ctx, 'name'); + + const entityName: string = 'entity'; + const subManifestName: string = 'subManifest'; + const relationshipName: string = 'relName'; + const traitName: string = "traitName"; + + const entityDec: CdmEntityDeclarationDefinition = manifest.entities.push(entityName); + const subManifest: CdmManifestDeclarationDefinition = manifest.subManifests.push(subManifestName); + const relationship: CdmE2ERelationship = manifest.relationships.push(relationshipName); + const trait: CdmTraitReferenceBase = manifest.exhibitsTraits.push(traitName); + + const copy: CdmManifestDefinition = manifest.copy() as CdmManifestDefinition; + copy.entities.allItems[0].entityName = 'newEntity'; + copy.subManifests.allItems[0].manifestName = 'newSubManifest'; + copy.relationships.allItems[0].name = 'newRelName'; + copy.exhibitsTraits.allItems[0].namedReference = 'newTraitName'; + + expect(entityDec.entityName) + .toBe(entityName); + expect(subManifest.manifestName) + .toBe(subManifestName); + expect(relationship.name) + .toBe(relationshipName); + expect(trait.namedReference) + .toBe(traitName); + }); +}); diff --git a/objectModel/TypeScript/__test__/Cdm/Projection/AttributeContextUtil.ts b/objectModel/TypeScript/__test__/Cdm/Projection/AttributeContextUtil.ts index 67191f7be6..37da5d6f1c 100644 --- a/objectModel/TypeScript/__test__/Cdm/Projection/AttributeContextUtil.ts +++ b/objectModel/TypeScript/__test__/Cdm/Projection/AttributeContextUtil.ts @@ -144,7 +144,7 @@ export class AttributeContextUtil { * A function to validate if the attribute context tree & traits generated for a resolved entity is the same as the expected and * saved attribute context tree & traits for a test case */ - public static async validateAttributeContext(corpus: CdmCorpusDefinition, expectedOutputPath: string, entityName: string, resolvedEntity: CdmEntityDefinition): Promise { + public static async validateAttributeContext(expectedOutputPath: string, entityName: string, resolvedEntity: CdmEntityDefinition, updateExpectedOutput: boolean = false): Promise { if (resolvedEntity.attributeContext) { // Actual const actualStringFilePath: string = `${expectedOutputPath.replace('ExpectedOutput', 'ActualOutput')}/AttrCtx_${entityName}.txt`; @@ -157,6 +157,9 @@ export class AttributeContextUtil { // Expected const expectedStringFilePath: string = `${expectedOutputPath}/AttrCtx_${entityName}.txt`; + if (updateExpectedOutput) { + fs.writeFileSync(expectedStringFilePath, actualText); + } const expectedText: string = fs.readFileSync(expectedStringFilePath).toString(); // Test if Actual is Equal to Expected diff --git a/objectModel/TypeScript/__test__/Cdm/Relationship/CalculateRelationship.test.ts b/objectModel/TypeScript/__test__/Cdm/Relationship/CalculateRelationship.test.ts index ccf4431181..3b5393ca06 100644 --- a/objectModel/TypeScript/__test__/Cdm/Relationship/CalculateRelationship.test.ts +++ b/objectModel/TypeScript/__test__/Cdm/Relationship/CalculateRelationship.test.ts @@ -128,7 +128,7 @@ describe('Cdm/Relationship/CalculateRelationshipTest', () => { /** * Common test code for these test cases */ - async function testRun(testName: string, entityName: string, isEntitySet: boolean): Promise { + async function testRun(testName: string, entityName: string, isEntitySet: boolean, updateExpectedOutput: boolean = false): Promise { const corpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, testName); const inputFolder: string = testHelper.getInputFolderPath(testsSubpath, testName); const expectedOutputFolder: string = testHelper.getExpectedOutputFolderPath(testsSubpath, testName); @@ -146,12 +146,8 @@ describe('Cdm/Relationship/CalculateRelationshipTest', () => { .toBeTruthy(); const resolvedEntity: CdmEntityDefinition = await projectionTestUtils.getResolvedEntity(corpus, entity, ['referenceOnly']); assertEntityShapeInReslovedEntity(resolvedEntity, isEntitySet); - const actualAttrCtx: string = getAttributeContextString(resolvedEntity, entityName, actualOutputFolder); - - const expectedAttrCtx: string = fs.readFileSync(`${expectedOutputFolder}/AttrCtx_${entityName}.txt`).toString(); - - expect(actualAttrCtx) - .toEqual(expectedAttrCtx); + + await AttributeContextUtil.validateAttributeContext(expectedOutputFolder, entityName, resolvedEntity, updateExpectedOutput); await corpus.calculateEntityGraphAsync(manifest); await manifest.populateManifestRelationshipsAsync(); diff --git a/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolution.test.ts b/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolution.test.ts index ebf58dc429..61024a14f8 100644 --- a/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolution.test.ts +++ b/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolution.test.ts @@ -21,6 +21,8 @@ import { import { ResolvedAttributeSet } from '../../../ResolvedModel/ResolvedAttributeSet'; import { LocalAdapter } from '../../../Storage'; import { AttributeResolutionDirectiveSet } from '../../../Utilities/AttributeResolutionDirectiveSet'; +import { AttributeContextUtil } from '../Projection/AttributeContextUtil'; +import { projectionTestUtils } from '../../Utilities/projectionTestUtils'; import { testHelper } from '../../testHelper'; import { resolutionTestUtils } from './ResolutionTestUtils'; @@ -31,7 +33,6 @@ import { resolutionTestUtils } from './ResolutionTestUtils'; describe('Cdm/Resolution/EntityResolution', () => { const testsSubpath: string = 'Cdm/Resolution/EntityResolution'; const schemaDocsRoot: string = testHelper.schemaDocumentsPath; - const doesWriteDebuggingFiles: boolean = false; /** * Tests if the owner of the entity is not changed when calling CreatedResolvedEntityAsync @@ -182,7 +183,6 @@ describe('Cdm/Resolution/EntityResolution', () => { */ it('TestAttributesThatAreReplaced', async (done) => { const corpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, 'TestAttributesThatAreReplaced'); - corpus.storage.mount('cdm', new LocalAdapter(testHelper.schemaDocumentsPath)); const extendedEntity: CdmEntityDefinition = await corpus.fetchObjectAsync('local:/extended.cdm.json/extended'); const resExtendedEnt: CdmEntityDefinition = await extendedEntity.createResolvedEntityAsync('resExtended'); @@ -290,7 +290,6 @@ describe('Cdm/Resolution/EntityResolution', () => { */ it('TestSettingTraitsForResolutionGuidanceAttributes', async (done) => { const corpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, 'TestSettingTraitsForResolutionGuidanceAttributes'); - corpus.storage.mount('cdm', new LocalAdapter(testHelper.schemaDocumentsPath)); const entity: CdmEntityDefinition = await corpus.fetchObjectAsync('local:/Customer.cdm.json/Customer'); // Resolve with default directives to get "is.linkedEntity.name" trait. @@ -311,4 +310,17 @@ describe('Cdm/Resolution/EntityResolution', () => { done(); }); + + /** + * Test that traits(including the ones inside of dataTypeRefence and PurposeReference) are applied to an entity attribute and type attribute. + */ + it('TestAppliedTraitsInAttributes', async (done) => { + const corpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, 'TestAppliedTraitsInAttributes'); + const expectedOutputFolder: string = testHelper.getExpectedOutputFolderPath(testsSubpath, 'TestAppliedTraitsInAttributes'); + const entity: CdmEntityDefinition = await corpus.fetchObjectAsync('local:/Sales.cdm.json/Sales'); + const resolvedEntity: CdmEntityDefinition = await projectionTestUtils.getResolvedEntity(corpus, entity, ['referenceOnly']); + await AttributeContextUtil.validateAttributeContext(expectedOutputFolder, 'Sales', resolvedEntity); + + done(); + }); }); diff --git a/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolutionTraitGroupTest.test.ts b/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolutionTraitGroupTest.test.ts index d1b86530b4..fdf35122d9 100644 --- a/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolutionTraitGroupTest.test.ts +++ b/objectModel/TypeScript/__test__/Cdm/Resolution/EntityResolutionTraitGroupTest.test.ts @@ -33,7 +33,9 @@ describe('Cdm/Resolution/EntityResolutionTraitGroupTest', () => { const cdmCorpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, 'TestResolvedTraitGroup'); cdmCorpus.setEventCallback((statusLevel: cdmStatusLevel, message: string) => { - fail(`Received ${statusLevel} message: ${message}`); + if (message.indexOf('Resolution guidance is being deprecated in favor of Projections.') === -1){ + fail(`Received ${statusLevel} message: ${message}`); + } }, cdmStatusLevel.warning); const ent = await cdmCorpus.fetchObjectAsync('local:/E2EResolution/Contact.cdm.json/Contact'); diff --git a/objectModel/TypeScript/__test__/Cdm/ResolutionGuidance/ResolutionGuidance.test.ts b/objectModel/TypeScript/__test__/Cdm/ResolutionGuidance/ResolutionGuidance.test.ts index 5ef186ec96..c616b90d4f 100644 --- a/objectModel/TypeScript/__test__/Cdm/ResolutionGuidance/ResolutionGuidance.test.ts +++ b/objectModel/TypeScript/__test__/Cdm/ResolutionGuidance/ResolutionGuidance.test.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. import * as fs from 'fs'; -import { CdmCorpusDefinition, CdmEntityDefinition, CdmFolderDefinition, cdmStatusLevel, CdmTypeAttributeDefinition } from '../../../internal'; +import { CdmCorpusDefinition, CdmEntityDefinition, CdmFolderDefinition, cdmLogCode, cdmStatusLevel, CdmTypeAttributeDefinition } from '../../../internal'; import { LocalAdapter } from '../../../Storage'; import { AttributeResolutionDirectiveSet } from '../../../Utilities/AttributeResolutionDirectiveSet'; import { resolveOptions } from '../../../Utilities/resolveOptions'; @@ -16,6 +16,30 @@ describe('Cdm.ResolutionGuidance', () => { const testsSubpath: string = 'Cdm/ResolutionGuidance'; const schemaDocsPath: string = testHelper.schemaDocumentsPath; + /** + * Tests if a warning is logged if resolution guidance is used + */ + it('TestResolutionGuidanceDeprecation', async (done) => { + var corpus = testHelper.getLocalCorpus(testsSubpath, 'TestResolutionGuidanceDeprecation'); + + // Tests warning log when resolution guidance is used on a data typed attribute. + var entity = await corpus.fetchObjectAsync('local:/TypeAttribute.cdm.json/Entity'); + await entity.createResolvedEntityAsync('res-entity'); + testHelper.expectCdmLogCodeEquality(corpus, cdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used on a entity typed attribute. + entity = await corpus.fetchObjectAsync('local:/EntityAttribute.cdm.json/Entity'); + await entity.createResolvedEntityAsync('res-entity'); + testHelper.expectCdmLogCodeEquality(corpus, cdmLogCode.WarnDeprecatedResolutionGuidance); + + // Tests warning log when resolution guidance is used when extending an entity. + entity = await corpus.fetchObjectAsync('local:/ExtendsEntity.cdm.json/Entity'); + await entity.createResolvedEntityAsync('res-entity'); + testHelper.expectCdmLogCodeEquality(corpus, cdmLogCode.WarnDeprecatedResolutionGuidance); + + done(); + }); + /** * Resolution Guidance Test - Resolve entity by name */ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json index 4b2bb12b66..c8af66d1eb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/fromEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "symbolEntityAttribute", "entity": { - "entityReference": "symbolEntity" + "source": "symbolEntity" } } ] diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json index 4bccd86ce4..2363f446fe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Corpus/TestResolveSymbolReference/Input/symbolEntity.cdm.json @@ -12,7 +12,7 @@ { "name": "fromEntityAttribute", "entity": { - "entityReference": "fromEntity" + "source": "fromEntity" } } ] diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt new file mode 100644 index 0000000000..72e754ca66 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestForwardCompatibility/TestAllOperations/ExpectedOutput/AttrCtx_TestAllOperations_referenceOnly.txt @@ -0,0 +1,105 @@ +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/projection/source/TestSource/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index5/operationExcludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/B +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index9/operationIncludeAttributes/C +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/A/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/B/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/TestAttributeGroup/C/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/members/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index2/operationAddCountAttribute/count/Resolved_TestAllOperations/hasAttributes/count/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index3/operationAddSupportingAttribute/support/Resolved_TestAllOperations/hasAttributes/support/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index4/operationAddTypeAttribute/_selectedEntityName/Resolved_TestAllOperations/hasAttributes/type/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/A@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/B@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound0/C@1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/A@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/B@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound1/C@2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2 +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/A@3/Resolved_TestAllOperations/hasAttributes/A/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/B@3/Resolved_TestAllOperations/hasAttributes/B/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3 +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index6/operationArrayExpansion/_generatedAttributeRound2/C@3/Resolved_TestAllOperations/hasAttributes/C/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/A/combined +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index7/operationCombineAttributes/combined/Resolved_TestAllOperations/hasAttributes/combined/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/extends/_generatedAttributeSet/operation/index8/operationRenameAttributes/A/NewA/Resolved_TestAllOperations/hasAttributes/NewA/(ref) +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/projection/source/TestSource +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/attributeContext/Resolved_TestAllOperations/replaceFK/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_TestAllOperations/hasAttributes/A_FK/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/TestAttributeGroup/(ref) +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/B +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/C +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/count +is.linkedEntity.array.count +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/support +is.addedInSupportOf + [Parameter (Name / DefaultValue): inSupportOf / ] + [Argument Value: C] +is.virtual.attribute +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/type +is.linkedEntity.name +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/combined +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/NewA +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.character +is.dataFormat.array +output:/Resolved_TestAllOperations.cdm.json/Resolved_TestAllOperations/hasAttributes/A_FK +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/TestSource.cdm.json/TestSource,A,replaceFK_TestSource] diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 64a36ebe69..5239494af2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,7 +14,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ec454952ae..705379816f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -25,6 +23,9 @@ output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/PersonAttributeGroup/email/Resolved_NewPerson/hasAttributes/PersonAttributeGroup/members/email/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/age/Resolved_NewPerson/hasAttributes/age/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationIncludeAttributes/phoneNumber diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 9fd0464867..af486f85a3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 4f0170be17..10d548107c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fbe5e69ceb..dc1df898c4 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestMultipleOpProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed0342ab77..e483ba2d07 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 99665fd3e4..e22c1145ea 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddAttributeGroup/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -1,38 +1,38 @@ -Resolved_Person_default/attributeContext/Resolved_Person_default/extends -Resolved_Person_default/attributeContext/Resolved_Person_default/extends/CdmEntity -Resolved_Person_default/attributeContext/Resolved_Person_default/name -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/name/Resolved_Person_default/hasAttributes/name/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/age -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/age/Resolved_Person_default/hasAttributes/age/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/address -Resolved_Person_default/attributeContext/Resolved_Person_default/address/projection -Resolved_Person_default/attributeContext/Resolved_Person_default/address/projection/source -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup -Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address/Resolved_Person_default/hasAttributes/AddressAttributeGroup/members/address/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/phoneNumber -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/phoneNumber/Resolved_Person_default/hasAttributes/phoneNumber/(ref) -Resolved_Person_default/attributeContext/Resolved_Person_default/email -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/attributeContext/Resolved_Person_default/email/Resolved_Person_default/hasAttributes/email/(ref) -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/name +Resolved_Person/attributeContext/Resolved_Person/extends +Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity +Resolved_Person/attributeContext/Resolved_Person/name +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) +Resolved_Person/attributeContext/Resolved_Person/age +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/age/Resolved_Person/hasAttributes/age/(ref) +Resolved_Person/attributeContext/Resolved_Person/address +Resolved_Person/attributeContext/Resolved_Person/address/projection +Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationAddAttributeGroup/AddressAttributeGroup/address/Resolved_Person/hasAttributes/AddressAttributeGroup/members/address/(ref) +Resolved_Person/attributeContext/Resolved_Person/phoneNumber +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/phoneNumber/Resolved_Person/hasAttributes/phoneNumber/(ref) +Resolved_Person/attributeContext/Resolved_Person/email +output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/email/Resolved_Person/hasAttributes/email/(ref) +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/age +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/AddressAttributeGroup/(ref) -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/phoneNumber +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/AddressAttributeGroup/(ref) +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_Person_default.cdm.json/Resolved_Person_default/hasAttributes/email +output:/Resolved_Person.cdm.json/Resolved_Person/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index bba3a7ad2b..053f314830 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestAddCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9ac859b512..96031b910d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOps/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63e35d480f..f4e2eb25b5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -10,8 +10,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/Person/address @@ -26,10 +24,16 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/new_name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/new_age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/new_address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/someCount/new_someCount Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_name/Resolved_NewPerson/hasAttributes/new_name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index fe0a943be1..57c16bb0c5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,11 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 7e5a255536..e1fec4ac66 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestCountAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt index 12ff168557..4f8dfb0f6c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestDuplicate/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt index ff3191b029..0a66e586a2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,11 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index a985c546d3..63be9bb246 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntity/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -2,8 +2,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/Person/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 2242d30372..adef43a487 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 5784b79231..02649fc140 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,11 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/someCount/Resolved_NewPerson/hasAttributes/someCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index fa515caf61..2dbb3968a8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroup/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,8 +6,3 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 46a33e42d5..bb8697d6f8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 1796b68a1b..e3930cb4cf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt index 52fbd75e21..8fb465ecae 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddCount/TestWithNestedArrayExpansion/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,8 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 113df5475a..1429f693f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestCombineOpsProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 23cf99a2e2..0df106edbb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -1,43 +1,41 @@ -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/extends -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/extends/CdmEntity -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/name/Resolved_NewPerson_default/hasAttributes/name/(ref) -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/age/Resolved_NewPerson_default/hasAttributes/age/(ref) -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/address/Resolved_NewPerson_default/hasAttributes/address/(ref) -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_default/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/projection/source/Person/email/Resolved_NewPerson_default/hasAttributes/email/(ref) -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/CdmEntity +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age/Resolved_NewPerson/hasAttributes/age/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address/Resolved_NewPerson/hasAttributes/address/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson/hasAttributes/phoneNumber/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email/Resolved_NewPerson/hasAttributes/email/(ref) +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/address is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized.txt deleted file mode 100644 index b424b14f0b..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/extends -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/extends/CdmEntity -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/name/Resolved_NewPerson_normalized/hasAttributes/name/(ref) -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/age/Resolved_NewPerson_normalized/hasAttributes/age/(ref) -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/address/Resolved_NewPerson_normalized/hasAttributes/address/(ref) -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_normalized/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/projection/source/Person/email/Resolved_NewPerson_normalized/hasAttributes/email/(ref) -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt deleted file mode 100644 index 5c0d65772a..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/extends -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/extends/CdmEntity -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/name/Resolved_NewPerson_normalized_structured/hasAttributes/name/(ref) -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/age/Resolved_NewPerson_normalized_structured/hasAttributes/age/(ref) -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/address/Resolved_NewPerson_normalized_structured/hasAttributes/address/(ref) -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_normalized_structured/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/projection/source/Person/email/Resolved_NewPerson_normalized_structured/hasAttributes/email/(ref) -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt index 1bcb67eec0..0e71c76126 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt @@ -1,53 +1,51 @@ -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/extends -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/extends/CdmEntity -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/name/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/name/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/age/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/age/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/address/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/address/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/projection/source/Person/email/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/email/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/CdmEntity +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age/Resolved_NewPerson/hasAttributes/age/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address/Resolved_NewPerson/hasAttributes/address/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson/hasAttributes/phoneNumber/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email/Resolved_NewPerson/hasAttributes/email/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson/hasAttributes/PersonInfo_display/(ref) +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/address is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/PersonInfo_display is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt deleted file mode 100644 index bb752f3cc4..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/extends -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/extends/CdmEntity -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly/hasAttributes/email/(ref) -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt deleted file mode 100644 index 648b6d88e9..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/extends -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/email/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt deleted file mode 100644 index 4d102cd18e..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/extends -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/email/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt index 7df306c182..0e71c76126 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt @@ -1,53 +1,51 @@ -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/extends -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/email/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/CdmEntity +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age/Resolved_NewPerson/hasAttributes/age/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address/Resolved_NewPerson/hasAttributes/address/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson/hasAttributes/phoneNumber/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email/Resolved_NewPerson/hasAttributes/email/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson/hasAttributes/PersonInfo_display/(ref) +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/address is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/PersonInfo_display is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt deleted file mode 100644 index e4d2986fd3..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/extends -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/extends/CdmEntity -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly_structured/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly_structured/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly_structured/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly_structured/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly_structured/hasAttributes/email/(ref) -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt index 2898f0769e..0e71c76126 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt @@ -1,53 +1,51 @@ -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/extends -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/extends/CdmEntity -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/name/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/name/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/age/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/age/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/address/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/address/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/projection/source/Person/email/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/email/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/CdmEntity +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age/Resolved_NewPerson/hasAttributes/age/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address/Resolved_NewPerson/hasAttributes/address/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson/hasAttributes/phoneNumber/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email/Resolved_NewPerson/hasAttributes/email/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationAddSupportingAttribute/PersonInfo_display/Resolved_NewPerson/hasAttributes/PersonInfo_display/(ref) +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/age +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/age is.dataFormat.integer is.dataFormat.integer -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/address +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/address is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/phoneNumber +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/phoneNumber is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/email +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/email is.dataFormat.character is.dataFormat.big is.dataFormat.array is.dataFormat.character is.dataFormat.array -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo_display +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/PersonInfo_display is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt deleted file mode 100644 index 78cbd70467..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ /dev/null @@ -1,45 +0,0 @@ -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/extends -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/extends/CdmEntity -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/extends -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/extends/CdmEntity -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/name -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/name/Resolved_NewPerson_structured/hasAttributes/name/(ref) -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/age -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/age/Resolved_NewPerson_structured/hasAttributes/age/(ref) -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/address -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/address/Resolved_NewPerson_structured/hasAttributes/address/(ref) -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/phoneNumber -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/phoneNumber/Resolved_NewPerson_structured/hasAttributes/phoneNumber/(ref) -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/email -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/projection/source/Person/email/Resolved_NewPerson_structured/hasAttributes/email/(ref) -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/name -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/age -is.dataFormat.integer -is.dataFormat.integer -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/address -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/phoneNumber -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/email -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 42a13f8187..0e71c76126 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestEntityAttributeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 387cf51fad..ac8a8d5b12 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestExtendsEntityProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -2,8 +2,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 85e00ba0d2..93368744c9 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,13 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6be0553a2f..1e1a902f42 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -1,13 +1,13 @@ -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/extends -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/extends/CdmEntity -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/Resolved_NewPerson_default/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/attributeContext/Resolved_NewPerson_default/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_default/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/PersonInfo -output:/Resolved_NewPerson_default.cdm.json/Resolved_NewPerson_default/hasAttributes/PersonInfo_display +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends +Resolved_NewPerson/attributeContext/Resolved_NewPerson/extends/CdmEntity +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Resolved_NewPerson/hasAttributes/PersonInfo/(ref) +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson/hasAttributes/PersonInfo_display/(ref) +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/PersonInfo +output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/PersonInfo_display is.dataFormat.character is.dataFormat.big is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt deleted file mode 100644 index e7a5109112..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/extends -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/extends/CdmEntity -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/Resolved_NewPerson_normalized/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/attributeContext/Resolved_NewPerson_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_normalized/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/PersonInfo -output:/Resolved_NewPerson_normalized.cdm.json/Resolved_NewPerson_normalized/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt deleted file mode 100644 index 9c56243575..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/extends -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/extends/CdmEntity -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/Resolved_NewPerson_normalized_structured/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/attributeContext/Resolved_NewPerson_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_normalized_structured/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/PersonInfo -output:/Resolved_NewPerson_normalized_structured.cdm.json/Resolved_NewPerson_normalized_structured/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt deleted file mode 100644 index d451e98d13..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_normalized_structured_virtual.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/extends -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/extends/CdmEntity -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/attributeContext/Resolved_NewPerson_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo -output:/Resolved_NewPerson_normalized_structured_virtual.cdm.json/Resolved_NewPerson_normalized_structured_virtual/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt deleted file mode 100644 index 0148946f48..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/extends -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/extends/CdmEntity -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/Resolved_NewPerson_referenceOnly/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/attributeContext/Resolved_NewPerson_referenceOnly/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly.cdm.json/Resolved_NewPerson_referenceOnly/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt deleted file mode 100644 index d056bff3c3..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/extends -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/attributeContext/Resolved_NewPerson_referenceOnly_normalized/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized.cdm.json/Resolved_NewPerson_referenceOnly_normalized/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt deleted file mode 100644 index 68bbd22ab6..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/extends -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt deleted file mode 100644 index 4b90de3141..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured_virtual.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/extends -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/extends/CdmEntity -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/attributeContext/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly_normalized_structured_virtual.cdm.json/Resolved_NewPerson_referenceOnly_normalized_structured_virtual/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt deleted file mode 100644 index a992ee424b..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/extends -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/extends/CdmEntity -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/Resolved_NewPerson_referenceOnly_structured/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/attributeContext/Resolved_NewPerson_referenceOnly_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly_structured/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly_structured.cdm.json/Resolved_NewPerson_referenceOnly_structured/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt deleted file mode 100644 index 10e424027f..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_virtual.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/extends -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/extends/CdmEntity -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/attributeContext/Resolved_NewPerson_referenceOnly_virtual/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo -output:/Resolved_NewPerson_referenceOnly_virtual.cdm.json/Resolved_NewPerson_referenceOnly_virtual/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_structured.txt deleted file mode 100644 index ecd5b19e90..0000000000 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddSupportingAttribute/TestTypeAttribute/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ /dev/null @@ -1,19 +0,0 @@ -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/extends -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/extends/CdmEntity -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/Resolved_NewPerson_structured/hasAttributes/PersonInfo/(ref) -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/_generatedAttributeSet -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0 -Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/attributeContext/Resolved_NewPerson_structured/PersonInfo/_generatedAttributeSet/_generatedAttributeRound0/supporting_PersonInfo/Resolved_NewPerson_structured/hasAttributes/PersonInfo_display/(ref) -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/PersonInfo -output:/Resolved_NewPerson_structured.cdm.json/Resolved_NewPerson_structured/hasAttributes/PersonInfo_display -is.dataFormat.character -is.dataFormat.big -is.dataFormat.array -means.reference.displayText -is.addedInSupportOf - [Parameter (Name / DefaultValue): inSupportOf / ] - [Argument Value: PersonInfo] -is.dataFormat.character -is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt index 901dbaea00..fcb83a949a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_default.txt @@ -18,6 +18,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/emailId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone @@ -27,6 +28,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social @@ -36,6 +38,7 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationCombineAttributes @@ -57,6 +60,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/contactId/new_contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/account +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactId Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_isPrimary/Resolved_Customer/hasAttributes/new_isPrimary/(ref) Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/new_contactId diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_referenceOnly_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt index d84117864f..7c09e1e2f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAddType/TestCombineOpsNestedProj/ExpectedOutput/AttrCtx_Customer_structured.txt @@ -11,25 +11,16 @@ Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/emailId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/address -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/emailInfo/Email/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/phoneId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/number -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/phoneInfo/Phone/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/socialId -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/account -Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/projection/source/projection/source/ContactInfo/socialInfo/Social/isPrimary Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationAddTypeAttribute/_selectedEntityName Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneInfo +Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialInfo Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType output:/Resolved_Customer.cdm.json/Resolved_Customer/attributeContext/Resolved_Customer/ContactAt/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/contactType/Resolved_Customer/hasAttributes/contactType/(ref) output:/Resolved_Customer.cdm.json/Resolved_Customer/hasAttributes/contactType diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt index 901113431d..4be9f15092 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeNestedProjection/ExpectedOutput/AttrCtx_NestedProjection_default.txt @@ -8,8 +8,6 @@ Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityA Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends -Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/attributeContext/Resolved_NestedProjection/TestEntityAttribute/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_NestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_NestedProjection.cdm.json/Resolved_NestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt index be2ef5e795..9823f1a921 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityAttributeProjection/ExpectedOutput/AttrCtx_TestEntAttrProj_default.txt @@ -4,8 +4,6 @@ Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAtt Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends -Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/extends/CdmEntity Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/attributeContext/Resolved_TestEntAttrProj/TestEntityAttribute/projection/source/TestSource/TestAttribute/Resolved_TestEntAttrProj/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntAttrProj.cdm.json/Resolved_TestEntAttrProj/hasAttributes/TestAttribute diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt index 621bbdff6c..73ea0f76d0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityNestedProjection/ExpectedOutput/AttrCtx_TestEntityNestedProjection_default.txt @@ -6,8 +6,6 @@ Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedPr Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends -Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/attributeContext/Resolved_TestEntityNestedProjection/extends/projection/source/projection/source/projection/source/TestSource/TestAttribute/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityNestedProjection.cdm.json/Resolved_TestEntityNestedProjection/hasAttributes/TestAttribute diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt index bd0ee0d0e0..814d044be0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionAttributeContext/TestEntityProjection/ExpectedOutput/AttrCtx_TestEntityProjection_default.txt @@ -2,8 +2,6 @@ Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/ext Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends -Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/extends/CdmEntity Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/attributeContext/Resolved_TestEntityProjection/extends/projection/source/TestSource/TestAttribute/Resolved_TestEntityProjection/hasAttributes/TestAttribute/(ref) output:/Resolved_TestEntityProjection.cdm.json/Resolved_TestEntityProjection/hasAttributes/TestAttribute diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt index 58bc0d1705..43c922e852 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionCombine/TestExtends/ExpectedOutput/AttrCtx_Customer_referenceOnly_normalized.txt @@ -2,19 +2,10 @@ Resolved_Customer/attributeContext/Resolved_Customer/extends Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/EmailID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/Address -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/EmailInfo/Email/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/PhoneID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/Number -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/PhoneInfo/Phone/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/SocialID -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/Account -Resolved_Customer/attributeContext/Resolved_Customer/extends/ContactInfo/SocialInfo/Social/IsPrimary Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0 Resolved_Customer/attributeContext/Resolved_Customer/extends/_generatedAttributeSet/_generatedAttributeRound0/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 56c9ca1d91..55f2d99206 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index e13c431847..6862d18e21 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,36 +4,32 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/age1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/address1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/phoneNumber1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/email1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/name2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/age2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/address2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/phoneNumber2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound1/email2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/name3 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/address3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/phoneNumber3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound2/email3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age1 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age2 +Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age3 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name1 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 6e2d14df45..4bdc8ca315 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 7f524d6527..797a5f7ac5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestArraySourceRename/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 4b41c95d04..6ba7fc48ac 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/address @@ -16,13 +14,12 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure @@ -33,6 +30,7 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/_generatedAttributeSet_template/_generatedAttributeRound0/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAge Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoName/Resolved_NewPerson/hasAttributes/PersonInfoName/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfoAddress diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 217d326c3e..9e8305a7fe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEANameProj/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,20 +4,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/OccupationInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/title -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/company -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/OccupationInfo/Occupation/tenure Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/EmployedPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index 234543d415..8550bf5b79 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestEmptyExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt index 38d63a7be1..23ce4d6792 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExcludeAttributes/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -13,6 +11,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt index f9e05b0dec..68621afccf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntity/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends Resolved_Child/attributeContext/Resolved_Child/extends/Person/extends/CdmEntity -Resolved_Child/attributeContext/Resolved_Child/extends/Person/phoneNumber -Resolved_Child/attributeContext/Resolved_Child/extends/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/Person/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/Person/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 625b0a7a4d..7d661e88bc 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address @@ -11,6 +9,8 @@ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/ Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_Child.cdm.json/Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_Child/hasAttributes/name/(ref) Resolved_Child/attributeContext/Resolved_Child/extends/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6a89967584..a212526b27 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroup/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 7aa34cf438..903904e129 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name @@ -15,6 +13,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index c36d9dde63..027e4bf78c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -8,9 +8,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGro Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 1b5366a75e..247302500e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestGroupRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/someGroup/someGroup/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt index ed9ac5a1c6..473afb5dec 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestMultipleExclude/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address @@ -15,9 +13,11 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttr Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index2/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 33546136cc..c36c5487ab 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -16,8 +14,13 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/hasAttributes/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index 3ce7c5663d..e2b169e510 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -22,8 +22,6 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/Conta Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index e4d8c86a78..ae86ac7875 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -29,9 +29,13 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/proje Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/socialId +Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/account Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/emailId/Resolved_BusinessPerson/hasAttributes/emailId/(ref) Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt index 340219c676..5ae50a2833 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSAN/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93a0378283..3513cdb156 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,9 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet_template/_generatedAttributeRound0/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt index 95e3491882..f057ca6def 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSSANRename/ExpectedOutput/AttrCtx_NewPerson_structured.txt @@ -4,9 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/extends/CdmEntity -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/address -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/phoneNumber -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/name/Resolved_NewPerson/hasAttributes/PersonInfo/members/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 93ddb42189..1d3f746d7b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address @@ -21,6 +19,9 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt index 8db35dbc0e..7e8c14168b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExclude/TestTypeAttributeProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -3,6 +3,9 @@ Resolved_Person/attributeContext/Resolved_Person/extends/CdmEntity Resolved_Person/attributeContext/Resolved_Person/address Resolved_Person/attributeContext/Resolved_Person/address/projection Resolved_Person/attributeContext/Resolved_Person/address/projection/source +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Person/attributeContext/Resolved_Person/address/_generatedAttributeSet/operation/index1/operationExcludeAttributes/address Resolved_Person/attributeContext/Resolved_Person/name output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/name/Resolved_Person/hasAttributes/name/(ref) Resolved_Person/attributeContext/Resolved_Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 85b0b16f15..56b912d14b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0/name1 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index cd9cd0db99..25f777a41c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,6 +8,3 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index af600525e5..531d3419c0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,9 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index fba97959fb..1e1d1b2d2f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -6,15 +6,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/project Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/Person/address Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d5835ac6a..6c64c2fba6 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestCombineOps/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -8,8 +8,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/Person/address @@ -18,10 +16,15 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/name@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/age@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound0/address@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/name@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound1/address@2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/name@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationArrayExpansion/_generatedAttributeRound2/address@3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name @@ -34,8 +37,34 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@1/age1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/age@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/address@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address1/address1@1/address1 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age2/age2@2/age2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address2/address2@2/address2 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/age3/age3@3/age3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3 +Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address3/address3@3/address3 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1 Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/operation/index1/operationIncludeAttributes/name/name1@1/name1 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestConditionalProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 1d9a8fec7b..ab08ce5691 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestEntityAttribute/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index a1ab17f96e..c89b71b328 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,9 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index bab48a082d..001eca582e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index bab48a082d..001eca582e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExpansion/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -4,6 +4,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 0d483f37ee..dc353d7f95 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestExtendsEntityProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/proje Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/extends/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 2dee2a32b1..e8be825363 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,9 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count output:/Resolved_ThreeMusketeers.cdm.json/Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/_generatedAttributeSet/count/Resolved_ThreeMusketeers/hasAttributes/count/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt index 21d440c1cd..86f6ecb413 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroup/ExpectedOutput/AttrCtx_ThreeMusketeers_referenceOnly_normalized_structured.txt @@ -6,6 +6,3 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/P Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/name -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/age -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/Person/someGroup/someGroup/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index b4f6d6a15c..e5929f6606 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestGroupProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 3b0394191b..aea14a2abd 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNegativeStartOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index e2a448d6d9..e9f820c691 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestNestedProj/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -10,8 +10,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt index efcd7768c1..e7125e5f4c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_default.txt @@ -2,14 +2,8 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count output:/Resolved_BusinessPerson.cdm.json/Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/_generatedAttributeSet/count/Resolved_BusinessPerson/hasAttributes/count/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt index 97ff779b6d..9bd13a4d46 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestPolymorphic/ExpectedOutput/AttrCtx_BusinessPerson_referenceOnly_normalized.txt @@ -2,11 +2,5 @@ Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/address -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/emailKind/Email/isPrimary Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_BusinessPerson/attributeContext/Resolved_BusinessPerson/contactAt/ContactKinds/phoneKind/Phone/isPrimary diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index d0cfd18e37..153f9f0498 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestProjNoRename/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -4,8 +4,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 451f798133..956998c967 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestSameStartEndOrdinals/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt index 4cc6969e4a..2db266a814 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionExpansion/TestStartGTEndOrdinal/ExpectedOutput/AttrCtx_ThreeMusketeers_default.txt @@ -6,8 +6,6 @@ Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/p Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends -Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/extends/CdmEntity Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/name Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/age Resolved_ThreeMusketeers/attributeContext/Resolved_ThreeMusketeers/ThreePeople/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 886c0b69ab..c4d1e41357 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt index ab29f4c5b6..6fb595fdf2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySource/ExpectedOutput/AttrCtx_SalesArraySource_structured.txt @@ -8,8 +8,6 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductsBought/members/ProductCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt index 0d82aa406e..397a36fe71 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestArraySourceProj/ExpectedOutput/AttrCtx_SalesArraySource_default.txt @@ -4,14 +4,7 @@ Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBou Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount output:/Resolved_SalesArraySource.cdm.json/Resolved_SalesArraySource/attributeContext/Resolved_SalesArraySource/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount/Resolved_SalesArraySource/hasAttributes/ProductCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt index 7ba825ce11..d1b9eb3648 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestCompositeKeyProj/ExpectedOutput/AttrCtx_SalesCompositeKey_default.txt @@ -6,11 +6,6 @@ Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesComp Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/extends/CdmEntity -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId1 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductId2 -Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/projection/source/ProductWith2Ids/ProductName Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesCompositeKey/attributeContext/Resolved_SalesCompositeKey/SalesCompositeKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt index d31b13c0ed..f6df6e1030 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestEntityAttributeProj/ExpectedOutput/AttrCtx_SalesEntityAttribute_default.txt @@ -4,8 +4,6 @@ Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/Pro Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends -Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesEntityAttribute.cdm.json/Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductId/Resolved_SalesEntityAttribute/hasAttributes/ProductId/(ref) Resolved_SalesEntityAttribute/attributeContext/Resolved_SalesEntityAttribute/ProductBought/projection/source/Product/ProductName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt index da5e883690..13ec6bfbcd 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestForeignKeyProj/ExpectedOutput/AttrCtx_SalesForeignKey_default.txt @@ -6,10 +6,6 @@ Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignK Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/extends/CdmEntity -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductId -Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/projection/source/Product/ProductName Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesForeignKey/attributeContext/Resolved_SalesForeignKey/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt index 58af7e7a06..ec1e398a75 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestGroupFKProj/ExpectedOutput/AttrCtx_SalesGroupFK_default.txt @@ -6,12 +6,6 @@ Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProd Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/extends/CdmEntity -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductId -Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/projection/source/ProductGroup/testGroup/testGroup/ProductName Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesGroupFK/attributeContext/Resolved_SalesGroupFK/SalesForeignKeyProductId/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt index c3364db34b..0e9d939e6f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestNestedFKProj/ExpectedOutput/AttrCtx_SalesNestedFK_default.txt @@ -14,10 +14,6 @@ Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyPr Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductId -Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/projection/source/projection/source/projection/source/Product/ProductName Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_SalesNestedFK/attributeContext/Resolved_SalesNestedFK/SalesForeignKeyProductId/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt index 635a1ff340..f7190014d0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestPolymorphicFKProj/ExpectedOutput/AttrCtx_PersonPolymorphicSourceFK_default.txt @@ -6,30 +6,6 @@ Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSo Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/emailId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/address -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/emailKind/projection/source/Email/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/phoneId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/number -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/phoneKind/projection/source/Phone/userId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/socialId -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/account -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/isPrimary -Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/projection/source/ContactKinds/socialKind/projection/source/Social/userId Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_PersonPolymorphicSourceFK/attributeContext/Resolved_PersonPolymorphicSourceFK/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt index 0e68c393b3..3fb817b20e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_default.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/_generatedAttributeSet_template diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_normalized_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_referenceOnly_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt index 4ccc91c8f2..ba26477eab 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionFK/TestSourceWithEAProj/ExpectedOutput/AttrCtx_SalesSourceWithEA_structured.txt @@ -4,16 +4,12 @@ Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBo Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductId/Resolved_SalesSourceWithEA/hasAttributes/ProductId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductName/Resolved_SalesSourceWithEA/hasAttributes/ProductName/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends -Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/extends/CdmEntity Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId output:/Resolved_SalesSourceWithEA.cdm.json/Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorId/Resolved_SalesSourceWithEA/hasAttributes/ProductColor/members/ColorId/(ref) Resolved_SalesSourceWithEA/attributeContext/Resolved_SalesSourceWithEA/ProductBought/projection/source/Product/ProductColor/Color/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt index ab8e8fee6e..a97f3125d5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArray/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt index 03d878aa31..7565883fd2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayProj/ExpectedOutput/AttrCtx_Sales_default.txt @@ -4,22 +4,24 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/extends/CdmEntity Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ThreeProductsBoughtProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0/ThreeProductsBought1ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound1/ThreeProductsBought2ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2 +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/projection/source/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound2/ThreeProductsBought3ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductId +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought2ProductName +Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought3ProductId Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBoughtProductCount/Resolved_Sales/hasAttributes/ThreeProductsBoughtProductCount/(ref) Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ThreeProductsBought1ProductName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt index d6715c3692..51c0b10a5b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_default.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/ProductCount Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_normalized_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_referenceOnly_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt index 899907f7f3..ce829154f0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestArrayRename/ExpectedOutput/AttrCtx_Sales_structured.txt @@ -8,8 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/Th Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductId -Resolved_Sales/attributeContext/Resolved_Sales/ProductsBought/ProductsOfThree/ThreeProductsBought/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/TotalPricePaid/Resolved_Sales/hasAttributes/TotalPricePaid/(ref) output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/TotalPricePaid diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_default.txt index be98618843..1e26c2d143 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_default.txt @@ -5,7 +5,6 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_normalized_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_referenceOnly_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt index 5e0a9d16c4..0b23b2550e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/ExpectedOutput/AttrCtx_Color_structured.txt @@ -2,7 +2,6 @@ Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red/Resolved_Color/hasAttributes/RGBColor/members/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/Color.cdm.json index 2ba9ad4d7d..ecb74df2b3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEA/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt index 0d47ce3fcd..22ebf8885d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -10,6 +10,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Bl Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/Color.cdm.json index 41552fc2fa..dae1745ae1 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEAProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt index c09cc5b7be..a9e2baa382 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,9 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Red -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Green -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/Blue -Resolved_Color/attributeContext/Resolved_Color/RGBColor/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/Color.cdm.json index 5abcebb4b5..2daa8013bd 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmpty/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt index eaddf1ea34..3a9f533f8f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -6,6 +6,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Re Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/Blue Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/RGB/IsGrayscale +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/ColorName output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/ColorName/Resolved_Color/hasAttributes/ColorName/(ref) output:/Resolved_Color.cdm.json/Resolved_Color/hasAttributes/ColorName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/Color.cdm.json index 7fff0c62f7..97e0fb9419 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestEmptyProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt index 50305e8aa7..37d015bfd5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/ExpectedOutput/AttrCtx_Color_default.txt @@ -1,6 +1,5 @@ Resolved_Color/attributeContext/Resolved_Color/extends Resolved_Color/attributeContext/Resolved_Color/extends/RGB -Resolved_Color/attributeContext/Resolved_Color/extends/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/RGB/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/Color.cdm.json index 6e21fa79e7..1f09b811ce 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtends/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt index aeace0b5f7..9ac59f31dd 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -8,6 +8,7 @@ Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/Blu Resolved_Color/attributeContext/Resolved_Color/extends/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/extends/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/Color.cdm.json index 336dd1359e..d60c3a3c6e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestExtendsProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt index fbcfdd01d7..3eb421bd9a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_default.txt @@ -1,12 +1,9 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Blue -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt index a3a22db20c..9b0c4856d2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,5 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color -Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB Resolved_Product/attributeContext/Resolved_Product/ProductColor/Color/RGBColor/RGB/Red diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupName/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt index e5384d5c2b..e48ae8c044 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_default.txt @@ -12,9 +12,14 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/sourc Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Red +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Green Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/Blue +Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source/Color/RGBColor/_generatedAttributeSet_template/_generatedAttributeRound0/IsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorGreen +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorIsGrayscale Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed output:/Resolved_Product.cdm.json/Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorRed/Resolved_Product/hasAttributes/RGBColorRed/(ref) Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColorBlue diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_normalized_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_referenceOnly_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt index 7e54114006..47dec0ae67 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/ExpectedOutput/AttrCtx_Product_structured.txt @@ -1,6 +1,7 @@ Resolved_Product/attributeContext/Resolved_Product/ProductColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/ColorName Resolved_Product/attributeContext/Resolved_Product/ProductColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/RGBColor Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection Resolved_Product/attributeContext/Resolved_Product/ProductColor/projection/source diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/Color.cdm.json index e92701a89a..969c374846 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestGroupNameProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/Color.cdm.json index d20b08d8db..dd877c2f25 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 1dc4c8a2be..5c569d0d07 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/Color.cdm.json index b63a983b03..98b1b331dc 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested1of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index 666afef429..0c63cfe79d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/Color.cdm.json index b897cbb23b..402eb1c49c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested2of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt index ad53e24427..951fab6abe 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/ExpectedOutput/AttrCtx_Color_default.txt @@ -14,6 +14,7 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projection/source/projection/source/RGB/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/Color.cdm.json index 8ad4a22f97..044f7e906d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNested3of3Proj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt index 376e456b6a..b633133155 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/ExpectedOutput/AttrCtx_Color_default.txt @@ -13,9 +13,12 @@ Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/projec Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Red +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/Blue +Resolved_Color/attributeContext/Resolved_Color/RGBColor/projection/source/_generatedAttributeSet/operation/index1/operationIncludeAttributes/IsGrayscale Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Green Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red output:/Resolved_Color.cdm.json/Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Red/Resolved_Color/hasAttributes/Red/(ref) Resolved_Color/attributeContext/Resolved_Color/RGBColor/_generatedAttributeSet/operation/index1/operationExcludeAttributes/Blue diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/Color.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/Color.cdm.json index 2dc0d4b84f..cb1c157e1a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/Color.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/Color.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/RGB.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/RGB.cdm.json index 10512a0015..54cbaba7af 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/RGB.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestNestedIncludeExcludeProj/Input/RGB.cdm.json @@ -3,7 +3,7 @@ "jsonSchemaSemanticVersion": "1.1.0", "imports": [ { - "corpusPath": "_allimports.cdm.json" + "corpusPath": "_allImports.cdm.json" } ], "definitions": [ diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt index dccb87fae9..cac7796e75 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_default.txt @@ -6,28 +6,19 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt index bd0b03cb81..ca570ec352 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphic/ExpectedOutput/AttrCtx_Person_structured.txt @@ -2,22 +2,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt index 06cc3332e2..dac5f713c5 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_default.txt @@ -14,7 +14,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/emailId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/address +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId @@ -23,7 +26,10 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/phoneId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/number +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId @@ -32,9 +38,17 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/Con Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0 +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/account +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/_generatedAttributeSet_template/_generatedAttributeRound0/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/isPrimary +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/address/Resolved_Person/hasAttributes/address/(ref) Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/number diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_normalized_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_referenceOnly_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt index 7580347a82..59dd83eec4 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionInclude/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person_structured.txt @@ -3,23 +3,13 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/emailKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/phoneKind +Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationIncludeAttributes/socialKind Resolved_Person/attributeContext/Resolved_Person/personId output:/Resolved_Person.cdm.json/Resolved_Person/attributeContext/Resolved_Person/personId/Resolved_Person/hasAttributes/personId/(ref) Resolved_Person/attributeContext/Resolved_Person/personName diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 2e18a46eed..c2c21e4a44 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_normalized_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_referenceOnly_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt index 576b285491..ebfbe09caf 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySource/ExpectedOutput/AttrCtx_FriendGroup_structured.txt @@ -8,11 +8,6 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMu Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/GroupOfPeople/members/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index 5a6f7c15c7..9041edb2de 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/_generatedAttributeRound0 diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt index bbe19ae0b1..3918bddf01 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestArraySourceRenameApplyToProj/ExpectedOutput/AttrCtx_FriendGroup_default.txt @@ -4,17 +4,7 @@ Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/extends/CdmEntity Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/extends/CdmEntity -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/name -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/age -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/address -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/phoneNumber -Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/Person/email Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount output:/Resolved_FriendGroup.cdm.json/Resolved_FriendGroup/attributeContext/Resolved_FriendGroup/GroupOfPeople/projection/source/ThreeMusketeers/ThreePeople/_generatedAttributeSet/personCount/Resolved_FriendGroup/hasAttributes/personCount/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 9e61059ac5..fbb20f9752 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_normalized_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt index 3fce673063..ab0528fc44 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestConditionalProj/ExpectedOutput/AttrCtx_NewPerson_referenceOnly_structured.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/personInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt index 63d02db80d..0df106edbb 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestEmptyApplyTo/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt index 87814dadf3..f524413365 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestExtendsEntityProj/ExpectedOutput/AttrCtx_Child_default.txt @@ -2,8 +2,6 @@ Resolved_Child/attributeContext/Resolved_Child/extends Resolved_Child/attributeContext/Resolved_Child/extends/projection Resolved_Child/attributeContext/Resolved_Child/extends/projection/source Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends -Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/extends/CdmEntity Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/name Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/age Resolved_Child/attributeContext/Resolved_Child/extends/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index fb1d9ada27..486536056a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestGroupProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/someGroup/someGroup/name diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt index 6726bb4db2..b4a66a23bd 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestMultipleRename/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 268ac036c4..f35d5b47f7 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 8fa72f3167..44527c5129 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameAndExcludeProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -6,8 +6,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/Person/address @@ -17,12 +15,19 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/name/PersonInfo--Name +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/age/PersonInfo--Age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/address/PersonInfo--Address +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/phoneNumber/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/_generatedAttributeSet/operation/index1/operationRenameAttributes/email/PersonInfo--Email Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Age +Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--PhoneNumber Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Name/Resolved_NewPerson/hasAttributes/PersonInfo--Name/(ref) Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/_generatedAttributeSet/operation/index1/operationExcludeAttributes/PersonInfo--Address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormat/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index 415417f2cf..5879d287e1 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatAsStringProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name output:/Resolved_NewPerson.cdm.json/Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name/Resolved_NewPerson/hasAttributes/name/(ref) diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index d97f09aa64..e7e6b54dc6 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestRenameFormatProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -4,8 +4,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt index e3a281f24d..8dfa526d62 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Projection/TestProjectionRename/TestSingleNestedProj/ExpectedOutput/AttrCtx_NewPerson_default.txt @@ -12,8 +12,6 @@ Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/sou Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends -Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/extends/CdmEntity Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/name Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/age Resolved_NewPerson/attributeContext/Resolved_NewPerson/PersonInfo/projection/source/projection/source/projection/source/projection/source/projection/source/Person/address diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index 3aa72deebc..a440fca681 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyNonPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/NonPoly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,name,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Person.cdm.json/Person/hasAttributes/something/entity/projection/source/NonPoly,number,something_NonPoly] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt index bbdf2b7560..7562f5c719 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeKeyPolymorphicRelationship/ExpectedOutput/AttrCtx_Person.txt @@ -2,16 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/something Resolved_Person/attributeContext/Resolved_Person/something/projection Resolved_Person/attributeContext/Resolved_Person/something/projection/source Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/address/projection/source/Address/name -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone -Resolved_Person/attributeContext/Resolved_Person/something/projection/source/poly/phone/projection/source/Phone/number Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/something/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -28,6 +18,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Address.cdm.json/Address,name,something_Address] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -40,6 +36,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Phone.cdm.json/Phone,number,something_Phone] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 94997e5824..83436a8455 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,11 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -25,6 +20,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -37,6 +38,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt index be6fe66d8a..cf2989287d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestDiffRefLocation/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt index 73db8ce2d9..dc4b8c111e 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestNestedCompositeProj/ExpectedOutput/AttrCtx_Sales.txt @@ -8,11 +8,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/proje Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductId2 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/projection/source/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -29,6 +24,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -41,6 +42,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId2,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt index 3006759dc1..d34d706446 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestPolymorphicProj/ExpectedOutput/AttrCtx_Person.txt @@ -2,24 +2,6 @@ Resolved_Person/attributeContext/Resolved_Person/contactAt Resolved_Person/attributeContext/Resolved_Person/contactAt/projection Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/emailId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/address -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/emailKind/Email/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/phoneId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/number -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/phoneKind/Phone/userId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/socialId -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/account -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/isPrimary -Resolved_Person/attributeContext/Resolved_Person/contactAt/projection/source/ContactKinds/socialKind/Social/userId Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Person/attributeContext/Resolved_Person/contactAt/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -38,6 +20,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,isPrimary,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,isPrimary,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,isPrimary,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array @@ -52,6 +40,12 @@ is.linkedEntity.identifier [Argument Value: local:/Email.cdm.json/Email,userId,contactAt_Email] [Argument Value: local:/Phone.cdm.json/Phone,userId,contactAt_Phone] [Argument Value: local:/Social.cdm.json/Social,userId,contactAt_Social] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt index 82607e3c41..5e2521d4aa 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Relationship/TestCalculateRelationship/TestWithoutIdProj/ExpectedOutput/AttrCtx_Sales.txt @@ -4,10 +4,6 @@ Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/extends/CdmEntity -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductId1 -Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product/ProductName Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey @@ -21,6 +17,12 @@ means.identity.entityId is.linkedEntity.identifier [Parameter (Name / DefaultValue): entityReferences / ] [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] is.dataFormat.guid is.dataFormat.character is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt new file mode 100644 index 0000000000..ff26b6ceb0 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/ExpectedOutput/AttrCtx_Sales.txt @@ -0,0 +1,44 @@ +Resolved_Sales/attributeContext/Resolved_Sales/extends +Resolved_Sales/attributeContext/Resolved_Sales/extends/CdmEntity +Resolved_Sales/attributeContext/Resolved_Sales/SalesName +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SalesName/Resolved_Sales/hasAttributes/SalesName/(ref) +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/projection/source/Product +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey +Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey +output:/Resolved_Sales.cdm.json/Resolved_Sales/attributeContext/Resolved_Sales/SaleEAKey/_generatedAttributeSet/operation/index1/operationReplaceAsForeignKey/_foreignKey/Resolved_Sales/hasAttributes/FKId1/(ref) +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/SalesName +is.dataFormat.numeric.shaped + [Parameter (Name / DefaultValue): precision / ] + [Argument Value: 15] + [Parameter (Name / DefaultValue): scale / ] + [Argument Value: -1] +has.description + [Parameter (Name / DefaultValue): description / ] + [Argument Value: en,testing purpose trait on a type attribute.] +means.idea.project +means.idea.scenario +is.dataFormat.numeric.shaped +output:/Resolved_Sales.cdm.json/Resolved_Sales/hasAttributes/FKId1 +is.dataFormat.character +is.dataFormat.big +is.dataFormat.array +is.dataFormat.guid +means.identity.entityId +is.linkedEntity.identifier + [Parameter (Name / DefaultValue): entityReferences / ] + [Argument Value: local:/Product.cdm.json/Product,ProductId1,SaleEAKey_Product] +means.forward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the forward direction in the relationship.] +means.backward + [Parameter (Name / DefaultValue): test / ] + [Argument Value: Description for the backward direction in the relationship.] +means.idea.project +means.idea.scenario +is.dataFormat.guid +is.dataFormat.character +is.dataFormat.array diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json new file mode 100644 index 0000000000..c45eaa3b90 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Product.cdm.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Product", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "purpose": "hasA", + "dataType": "integer", + "name": "ProductId1" + }, + { + "purpose": "hasA", + "dataType": "string", + "name": "ProductName" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json new file mode 100644 index 0000000000..ad4113ca02 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/Sales.cdm.json @@ -0,0 +1,125 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "_allImports.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Sales", + "extendsEntity": "CdmEntity", + "hasAttributes": [ + { + "dataType": { + "dataTypeReference": "decimal", + "appliedTraits": [ + { + "traitReference": "is.dataFormat.numeric.shaped", + "arguments": [ + { + "name": "precision", + "value": "15" + }, + { + "name": "scale", + "value": "-1" + } + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "has.description", + "arguments": [ + { + "entityReference": { + "entityShape": "localizedTable", + "constantValues": [ + [ + "en", + "testing purpose trait on a type attribute." + ] + ] + } + } + ] + } + ] + }, + "name": "SalesName" + }, + { + "name": "SaleEAKey", + "purpose": { + "purposeReference": "hasA", + "appliedTraits": [ + { + "traitReference": "means.forward", + "arguments": [ + "Description for the forward direction in the relationship." + ] + }, + { + "traitReference": "means.backward", + "arguments": [ + "Description for the backward direction in the relationship." + ] + } + ] + }, + "appliedTraits": [ + "means.idea.project", + "means.idea.scenario" + ], + "entity": { + "source": "Product", + "operations": [ + { + "$type": "replaceAsForeignKey", + "reference": "ProductId1", + "replaceWith": { + "dataType": "entityId", + "name": "FKId1" + } + } + ] + } + } + ], + "version": "1.0" + }, + { + "traitName": "means.backward", + "explanation": "the attribute represents B->A.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship B->A", + "required": false + } + ] + }, + { + "traitName": "means.forward", + "explanation": "the attribute represents A->B.", + "hasParameters": [ + { + "name": "test", + "dataType": "string", + "explanation": "The description of the relationship A->B", + "required": false + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json new file mode 100644 index 0000000000..4cd76e31b8 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/_allImports.cdm.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "Product.cdm.json" + }, + { + "corpusPath": "Sales.cdm.json" + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json new file mode 100644 index 0000000000..d06466170d --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/Resolution/EntityResolution/TestAppliedTraitsInAttributes/Input/default.manifest.cdm.json @@ -0,0 +1,25 @@ +{ + "$schema": "../../../../../../../../../schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.1.0", + "manifestName": "default.manifest.cdm.json", + "entities": [ + { + "type": "LocalEntity", + "entityName": "Product", + "entityPath": "Product.cdm.json/Product" + }, + { + "type": "LocalEntity", + "entityName": "Sales", + "entityPath": "Sales.cdm.json/Sales" + } + ], + "relationships": [ + { + "fromEntity": "Sales.cdm.json/Sales", + "fromEntityAttribute": "FKId1", + "toEntity": "Product.cdm.json/Product", + "toEntityAttribute": "ProductId1" + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json index 2ef1eb5784..29b947442f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_d.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json index c2da629550..2eff10ee55 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_n.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json index 0f938a4a36..22d15ac65c 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json index af96808ed2..bfb4485561 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinal23AndAddCount/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json @@ -62,18 +62,6 @@ "definition": "resolvedFrom/CdmEntity" } ] - }, - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/EmployeeAddress/Address", - "definition": "resolvedFrom/Address/hasAttributes/State" } ] }, diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json index dff3f6147e..90c23a96e1 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_d.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_d/attributeContext/EmployeeAddresses_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json index d4ee3dbe36..fc80aac5ee 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_n/attributeContext/EmployeeAddresses_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json index 314961644e..12ae311867 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro/attributeContext/EmployeeAddresses_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json index bdab351b98..8dc80c5cb3 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestExpansionAndRenamedOrdinalWithAttributeGroupRef/ExpectedOutput/EmployeeAddresses_R_ro_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "City", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/City" - }, - { - "type": "attributeDefinition", - "name": "State", - "parent": "EmployeeAddresses_R_ro_n/attributeContext/EmployeeAddresses_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeAddress/Address/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope/members/State" - } - ] + "definition": "resolvedFrom/Address/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json index 12afc9b331..e3bd3da3e9 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json index dcd16efa20..60040eb927 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json index 07c2a2c9f9..10a9532a4b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_n_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 80ea91d739..f17924da7a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index b258be494d..73bdffd856 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json index d4b94e554d..a475805158 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json index 25b655e7cc..fd84afd06d 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json index cbfc41709a..fd4ea7b661 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSome/ExpectedOutput/EmployeeNames_R_s.cdm.json @@ -73,51 +73,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json index d9ca2d6d63..e26bb42242 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json index 05a8bb669b..b989b31d3b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json index fc51aa8e8c..24d35953a8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n_s/attributeContext/EmployeeNames_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 768de2b532..e5ae1cfbf8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index c5f5e60663..35faae3fa2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json index 75533f8e6f..9bd71dc416 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n_s/attributeContext/EmployeeNames_R_ro_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json index 95dcdd0196..2f060f5684 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_s/attributeContext/EmployeeNames_R_ro_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json index 955ab116d0..21791175a1 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterInSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_s.cdm.json @@ -85,51 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "First_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/First_Name" - }, - { - "type": "attributeDefinition", - "name": "Last_Name", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_s/attributeContext/EmployeeNames_R_s/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" - } - ] + "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json index 12afc9b331..e3bd3da3e9 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json index dcd16efa20..60040eb927 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 80ea91d739..f17924da7a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index b258be494d..73bdffd856 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSome/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -75,12 +75,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -92,30 +86,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json index d9ca2d6d63..e26bb42242 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_d.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_d/attributeContext/EmployeeNames_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json index 05a8bb669b..b989b31d3b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_n/attributeContext/EmployeeNames_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json index 768de2b532..e5ae1cfbf8 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro/attributeContext/EmployeeNames_R_ro/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json index c5f5e60663..35faae3fa2 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestFilterOutSomeWithAttributeGroupRef/ExpectedOutput/EmployeeNames_R_ro_n.cdm.json @@ -87,12 +87,6 @@ "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope", "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/ID" - }, { "type": "attributeDefinition", "name": "First_Name", @@ -104,30 +98,6 @@ "name": "Last_Name", "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Last_Name" - }, - { - "type": "attributeDefinition", - "name": "Date_Of_Joining", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Date_Of_Joining" - }, - { - "type": "attributeDefinition", - "name": "Office_Number", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Number" - }, - { - "type": "attributeDefinition", - "name": "Office_Building", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Building" - }, - { - "type": "attributeDefinition", - "name": "Office_Geo_Location", - "parent": "EmployeeNames_R_ro_n/attributeContext/EmployeeNames_R_ro_n/attributesAddedAtThisScope/attributesAddedAtThisScope/EmployeeNames/Employee/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Employee/hasAttributes/attributesAddedAtThisScope/members/Office_Geo_Location" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json index 80cad90dfb..872cff092b 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_d.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -158,21 +144,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_d/attributeContext/Sales_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json index c320b9c6b3..29e7d168e0 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -142,21 +128,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n/attributeContext/Sales_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json index 4865ec3c27..da9fb35c6f 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyManyToManyCardinality/ExpectedOutput/Sales_R_n_s.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/CustomerID/Customer/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Customer/hasAttributes/attributesAddedAtThisScope" } ] } @@ -142,21 +128,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Sales_R_n_s/attributeContext/Sales_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/ProductID/Product/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Product/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json index 88d5936917..40d69df432 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_d.cdm.json @@ -103,21 +103,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_d/attributeContext/Employee_R_d/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json index fba7d3d38e..5d22e6ac8a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n/attributeContext/Employee_R_n/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json index ec998ece7a..d6ac286d5a 100644 --- a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestForeignKeyOneToManyCardinality/ExpectedOutput/Employee_R_n_s.cdm.json @@ -85,21 +85,7 @@ "type": "attributeGroup", "name": "attributesAddedAtThisScope", "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope", - "contents": [ - { - "type": "attributeDefinition", - "name": "ID", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/ID" - }, - { - "type": "attributeDefinition", - "name": "Name", - "parent": "Employee_R_n_s/attributeContext/Employee_R_n_s/attributesAddedAtThisScope/attributesAddedAtThisScope/TeamID/Team/attributesAddedAtThisScope/attributesAddedAtThisScope", - "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope/members/Name" - } - ] + "definition": "resolvedFrom/Team/hasAttributes/attributesAddedAtThisScope" } ] } diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json new file mode 100644 index 0000000000..1a293e720c --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/BaseEntity.cdm.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "BaseEntity", + "hasAttributes": [ + { + "name": "email", + "dataType": "string" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json new file mode 100644 index 0000000000..ac2905871f --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/EntityAttribute.cdm.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json new file mode 100644 index 0000000000..a17c5abad9 --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/ExtendsEntity.cdm.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + }, + { + "corpusPath": "BaseEntity.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "extendsEntity": "BaseEntity", + "extendsEntityResolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + }, + "hasAttributes": [ + { + "name": "name", + "entity": "BaseEntity" + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json new file mode 100644 index 0000000000..d04d2cd88e --- /dev/null +++ b/objectModel/TypeScript/__test__/TestData/Cdm/ResolutionGuidance/TestResolutionGuidanceDeprecation/Input/TypeAttribute.cdm.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/CDM/master/schemaDocuments/schema.cdm.json", + "jsonSchemaSemanticVersion": "1.2.0", + "imports": [ + { + "corpusPath": "cdm:/foundations.cdm.json" + } + ], + "definitions": [ + { + "entityName": "Entity", + "hasAttributes": [ + { + "name": "name", + "dataType": "string", + "resolutionGuidance": { + "addSupportingAttribute": { + "name": "supportingAttribute", + "dataType": "string" + } + } + } + ] + } + ] +} \ No newline at end of file diff --git a/objectModel/TypeScript/__test__/Utilities/projectionTestUtils.ts b/objectModel/TypeScript/__test__/Utilities/projectionTestUtils.ts index c7eca25a8b..54fcc84f37 100644 --- a/objectModel/TypeScript/__test__/Utilities/projectionTestUtils.ts +++ b/objectModel/TypeScript/__test__/Utilities/projectionTestUtils.ts @@ -8,6 +8,7 @@ import { CdmEntityDefinition, CdmEntityReference, CdmFolderDefinition, + cdmLogCode, cdmObjectType, CdmProjection, CdmTypeAttributeDefinition, @@ -29,6 +30,13 @@ export class projectionTestUtils { */ public static foundationJsonPath: string = 'cdm:/foundations.cdm.json'; + /** + * The log codes that are allowed to be logged without failing the test\ + */ + private static allowedLogs: Set = new Set([ + cdmLogCode[cdmLogCode.WarnDeprecatedResolutionGuidance] + ]); + /** * Resolves an entity * @param corpus The corpus @@ -96,7 +104,11 @@ export class projectionTestUtils { const corpus: CdmCorpusDefinition = testHelper.getLocalCorpus(testsSubpath, testName); corpus.setEventCallback((statusLevel: cdmStatusLevel, message: string) => { - throw new Error(message); + const events = corpus.ctx.events; + const lastEvent: Map = events.allItems[events.length - 1]; + if (!lastEvent.get('code') || !this.allowedLogs.has(lastEvent.get('code'))) { + throw new Error(message); + } }, cdmStatusLevel.warning); return corpus; diff --git a/objectModel/TypeScript/package-lock.json b/objectModel/TypeScript/package-lock.json index 3fc11f84dc..97fb3a9c1e 100644 --- a/objectModel/TypeScript/package-lock.json +++ b/objectModel/TypeScript/package-lock.json @@ -1,21 +1,21 @@ { "name": "cdm.objectmodel", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cdm.objectmodel", - "version": "1.2.1", + "version": "1.2.2", "dependencies": { "@azure/msal-node": "^1.0.2", + "@types/node": "^14.14.31", "guid-typescript": "^1.0.9", "using-statement": "^0.3.1" }, "devDependencies": { "@babel/preset-env": "^7.7.6", "@types/jest": "^26.0.14", - "@types/node": "^14.14.31", "babelify": "^10.0.0", "eslint": "^7.21.0", "jest": "^26.6.3", @@ -1867,8 +1867,7 @@ "node_modules/@types/node": { "version": "14.14.31", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", - "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", - "dev": true + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.0", @@ -2404,22 +2403,26 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "dependencies": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^1.1.71" }, "bin": { "browserslist": "cli.js" }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" } }, "node_modules/bs-logger": { @@ -2503,10 +2506,14 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001194", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001194.tgz", - "integrity": "sha512-iDUOH+oFeBYk5XawYsPtsx/8fFpndAPUQJC7gBTfxHM8xw5nOZv7ceAD4frS1MKCLUac7QL5wdAJiFQlDRjXlA==", - "dev": true + "version": "1.0.30001228", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", + "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } }, "node_modules/capture-exit": { "version": "2.0.0", @@ -3005,9 +3012,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.3.678", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.678.tgz", - "integrity": "sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg==", + "version": "1.3.737", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz", + "integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==", "dev": true }, "node_modules/emittery": { @@ -4160,9 +4167,9 @@ } }, "node_modules/hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "node_modules/html-encoding-sniffer": { @@ -11083,8 +11090,7 @@ "@types/node": { "version": "14.14.31", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", - "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", - "dev": true + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -11531,16 +11537,16 @@ "dev": true }, "browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^1.1.71" } }, "bs-logger": { @@ -11612,9 +11618,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001194", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001194.tgz", - "integrity": "sha512-iDUOH+oFeBYk5XawYsPtsx/8fFpndAPUQJC7gBTfxHM8xw5nOZv7ceAD4frS1MKCLUac7QL5wdAJiFQlDRjXlA==", + "version": "1.0.30001228", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", + "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", "dev": true }, "capture-exit": { @@ -12029,9 +12035,9 @@ } }, "electron-to-chromium": { - "version": "1.3.678", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.678.tgz", - "integrity": "sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg==", + "version": "1.3.737", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz", + "integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==", "dev": true }, "emittery": { @@ -12948,9 +12954,9 @@ } }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "html-encoding-sniffer": { diff --git a/objectModel/TypeScript/package.json b/objectModel/TypeScript/package.json index 5fdc4c5aae..c5da99af41 100644 --- a/objectModel/TypeScript/package.json +++ b/objectModel/TypeScript/package.json @@ -1,6 +1,6 @@ { "name": "cdm.objectmodel", - "version": "1.2.1", + "version": "1.2.2", "description": "The typescript object model for CDM.", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/objectModel/TypeScript/resx/logMessages.json b/objectModel/TypeScript/resx/logMessages.json index dd62ca22f5..96458b0287 100644 --- a/objectModel/TypeScript/resx/logMessages.json +++ b/objectModel/TypeScript/resx/logMessages.json @@ -107,6 +107,7 @@ "ErrValdnMissingDoc": "Document '{0}' is not in a folder", "ErrValdnMissingLanguageTag": "Default value missing languageTag or displayText.", "ErrUnrecognizedType": "Unrecognized Type", + "WarnDeprecatedResolutionGuidance": "Resolution guidance is being deprecated in favor of Projections. https://docs.microsoft.com/en-us/common-data-model/sdk/convert-logical-entities-resolved-entities#projection-overview.", "WarnDocChangesDiscarded": "discarding changes in document {0}", "WarnPartitionGlobAndRegexPresent": "The Data Partition Pattern contains both a glob pattern ({0}) and a regular expression ({1}) set, the glob pattern will be used.", "WarnDocImportNotLoaded": "Import document {0} not loaded. This may cause unexpected behavior of the model.",