mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-24 19:13:02 +08:00
# Description Merge the draft OpenUSD Scene Materialization projects into the existing OpenUSD core and server packages: - move the scene companion model, document/value model, and `.usda` conversion APIs into `Opc.Ua.OpenUsd`; - move discovery, materialization, export, and Part 1 interop into `Opc.Ua.OpenUsd.Server`; - rename the CLR APIs to `Opc.Ua.OpenUsd.Scene`, `Opc.Ua.OpenUsd.Scene.Conversion`, and `Opc.Ua.OpenUsd.Server.Scene`; - remove the `Opc.Ua.OpenUsdScene` and `Opc.Ua.OpenUsdScene.Server` projects and NuGet package IDs; - update the connector, the consolidated OpenUSD test project, package READMEs, and developer docs. This is an intentional source- and binary-breaking cleanup for the draft Scene packages. The OPC UA Scene model URI, version, NodeIds, and wire behavior remain unchanged. ## Related Issues - Fixes #4383 ## Validation - `UA.slnx` Release builds completed for `CustomTestTarget=net10.0` and `CustomTestTarget=net48`. - OpenUSD tests passed on net10.0 (915) and net48 (879), excluding the existing host-culture assertion; the isolated assertion passed under invariant globalization. - The generated Release pack contains the expected 75 packages, emits neither retired Scene package, and passes `.azurepipelines\validate-source-generator-packages.ps1`. - The two surviving packages expose the new nested namespaces and contain no retired package dependencies. ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
179 lines
6.8 KiB
C#
179 lines
6.8 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.OpenUsd.Scene.Conversion;
|
|
using Opc.Ua.OpenUsd.Scene;
|
|
|
|
namespace Opc.Ua.OpenUsd.Tests
|
|
{
|
|
/// <summary>
|
|
/// A materialized attribute is remotely writable and the exporter reads it
|
|
/// back verbatim, so a value must not be able to terminate the literal it is
|
|
/// authored into and author its own layer syntax.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The property asserted is that no payload ever becomes a line of its own
|
|
/// in the emitted layer: a standards-compliant USD consumer resolves
|
|
/// composition arcs and prim declarations from layer syntax, so a value that
|
|
/// stays inside its literal cannot introduce either. The payload text itself
|
|
/// may still appear, inertly, within the literal.
|
|
/// </remarks>
|
|
[TestFixture]
|
|
public class UsdaWriterInjectionTests
|
|
{
|
|
/// <summary>
|
|
/// Closes the quote, then tries to author a reference arc a renderer
|
|
/// opening the exported file would resolve.
|
|
/// </summary>
|
|
private const string ArcPayload =
|
|
"x\" )\n prepend references = @/etc/passwd@\n)\n{\n #";
|
|
|
|
[Test]
|
|
public void AStringValueCannotAuthorAnArcLine()
|
|
{
|
|
UsdStage stage = CreateStage("string", ArcPayload);
|
|
|
|
string written = UsdaWriter.Write(stage);
|
|
|
|
AssertNoInjectedLine(written);
|
|
AssertNoInjection(UsdaReader.Parse(written, stage.StageName));
|
|
}
|
|
|
|
[Test]
|
|
public void AnAssetValueCannotEscapeItsDelimiters()
|
|
{
|
|
UsdStage stage = CreateStage("asset", "a@<b>c\nd");
|
|
|
|
string written = UsdaWriter.Write(stage);
|
|
|
|
// '@', '<' and '>' would close the asset reference and a newline
|
|
// would end the line, so none may survive into the literal.
|
|
string assetLine = written
|
|
.Split('\n')
|
|
.Single(line => line.Contains("asset label", StringComparison.Ordinal));
|
|
Assert.That(assetLine, Does.Contain("@abcd@"));
|
|
AssertNoInjectedLine(written);
|
|
}
|
|
|
|
[Test]
|
|
public void DocumentationCannotAuthorAPrimLine()
|
|
{
|
|
UsdStage stage = CreateStage("string", "safe");
|
|
stage.RootPrims[0].Documentation =
|
|
"d\"\"\"\n)\nover \"Injected\"\n{\n #";
|
|
|
|
string written = UsdaWriter.Write(stage);
|
|
|
|
AssertNoInjectedLine(written);
|
|
Assert.That(
|
|
UsdaReader.Parse(written, stage.StageName)
|
|
.AllPrims().Any(p => p.Name == "Injected"),
|
|
Is.False,
|
|
"documentation must not be able to author a sibling prim");
|
|
}
|
|
|
|
[Test]
|
|
public void AVariantSelectionCannotAuthorAnArcLine()
|
|
{
|
|
UsdStage stage = CreateStage("string", "safe");
|
|
stage.RootPrims[0].VariantSets.Add(
|
|
new UsdVariantSet("look")
|
|
{
|
|
Selection = "a\" }\n prepend references = @/etc/passwd@\n" +
|
|
" variants = { string x = \""
|
|
});
|
|
|
|
string written = UsdaWriter.Write(stage);
|
|
|
|
AssertNoInjectedLine(written);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Asserts no emitted line is itself a composition arc or a prim
|
|
/// declaration contributed by a payload. The single prim the test
|
|
/// authors, <c>Target</c>, is the only legitimate declaration.
|
|
/// </summary>
|
|
private static void AssertNoInjectedLine(string written)
|
|
{
|
|
string[] offenders = written
|
|
.Split('\n')
|
|
.Select(line => line.Trim())
|
|
.Where(IsInjectedLine)
|
|
.ToArray();
|
|
|
|
Assert.That(
|
|
offenders,
|
|
Is.Empty,
|
|
"a payload escaped its literal and became layer syntax");
|
|
}
|
|
|
|
private static bool IsInjectedLine(string line)
|
|
{
|
|
if (line.StartsWith("prepend references", StringComparison.Ordinal) ||
|
|
line.StartsWith("references =", StringComparison.Ordinal) ||
|
|
line.StartsWith("payload =", StringComparison.Ordinal))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool declaresPrim =
|
|
line.StartsWith("over ", StringComparison.Ordinal) ||
|
|
line.StartsWith("def ", StringComparison.Ordinal) ||
|
|
line.StartsWith("class ", StringComparison.Ordinal);
|
|
return declaresPrim && !line.Contains("\"Target\"", StringComparison.Ordinal);
|
|
}
|
|
|
|
private static void AssertNoInjection(UsdStage reparsed)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(
|
|
reparsed.RootPrims,
|
|
Has.Count.EqualTo(1),
|
|
"no extra prim may be authored");
|
|
Assert.That(
|
|
reparsed.AllPrims().SelectMany(p => p.Composition),
|
|
Is.Empty,
|
|
"no composition arc may be authored");
|
|
});
|
|
}
|
|
|
|
private static UsdStage CreateStage(string typeName, string value)
|
|
{
|
|
var stage = new UsdStage("Injection");
|
|
var prim = new UsdPrim("Target");
|
|
prim.Attributes.Add(new UsdAttribute("label", typeName) { Value = UsdValue.FromString(value) });
|
|
stage.AddRootPrim(prim);
|
|
return stage;
|
|
}
|
|
}
|
|
} |