Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pocos namespaces are backed prefixed instead of postfixed #345

Merged
merged 2 commits into from
Dec 2, 2024
Merged

pocos namespaces are backed prefixed instead of postfixed #345

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0eebd
the pocos namespaces are backed prefixed instead of postfixed
PTKu Nov 29, 2024
13b62c8
fixing integration testing
PTKu Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixing integration testing
  • Loading branch information
@PTKu
PTKu committed Dec 2, 2024
commit 13b62c80b314aeafc0d2cc3dd474ef9e7c23dc44
41 changes: 28 additions & 13 deletions cake/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,19 +170,34 @@ public override void Run(BuildContext context)
}
if (context.BuildParameters.TestLevel >= 3)
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf"));

context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf"));
// This must be run in a separate environment!
try
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf"));
}
catch
{
System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT");
}

try
{
context.UploadTestPlc(
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf"));
}
catch
{
System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT");
}
}


Expand Down
2 changes: 2 additions & 0 deletions src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/TestConnector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public static ax_test_projectTwinController SecurePlc
securePlc = new(ConnectorAdapterBuilder.Build()
.CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USERNAME"),
Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true));

SecurePlc.Connector.BuildAndStart();
}
return securePlc;
}
Expand Down
20 changes: 10 additions & 10 deletions src/AXSharp.connectors/tests/ax-test-project/apax-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
},
"@ax/sld": {
"name": "@ax/sld",
"version": "3.0.6",
"integrity": "sha512-j90GJh1jMIpvB521EIxvTq6rhr8OO+6qqwsXn2Of7GxQrzwWi+NEXe9ss/ccFAKL0I7aEGD+SIW8jVHUgMAvow==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.6.tgz",
"version": "3.0.8",
"integrity": "sha512-4YSQf0eXLTGN0LmBBKFYUyhuhZAxH11W+kZfHAjXy5cIkJhhf5g50d/GDZHj5q5hcY/GEIerKLL+B3RUBejHgg==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.8.tgz",
"cpu": [
"x64"
],
Expand Down Expand Up @@ -617,6 +617,13 @@
],
"dependencies": {}
},
"@ax/st-docs": {
"name": "@ax/st-docs",
"version": "7.1.87",
"integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz",
"dependencies": {}
},
"@ax/system-strings": {
"name": "@ax/system-strings",
"version": "7.1.47",
Expand Down Expand Up @@ -679,13 +686,6 @@
],
"dependencies": {}
},
"@ax/st-docs": {
"name": "@ax/st-docs",
"version": "7.1.87",
"integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz",
"dependencies": {}
},
"@ax/system-math": {
"name": "@ax/system-math",
"version": "7.1.47",
Expand Down
20 changes: 10 additions & 10 deletions src/tests.integrations/integrated/src/ax/apax-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
},
"@ax/sld": {
"name": "@ax/sld",
"version": "3.0.6",
"integrity": "sha512-j90GJh1jMIpvB521EIxvTq6rhr8OO+6qqwsXn2Of7GxQrzwWi+NEXe9ss/ccFAKL0I7aEGD+SIW8jVHUgMAvow==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.6.tgz",
"version": "3.0.8",
"integrity": "sha512-4YSQf0eXLTGN0LmBBKFYUyhuhZAxH11W+kZfHAjXy5cIkJhhf5g50d/GDZHj5q5hcY/GEIerKLL+B3RUBejHgg==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.8.tgz",
"cpu": [
"x64"
],
Expand Down Expand Up @@ -617,6 +617,13 @@
],
"dependencies": {}
},
"@ax/st-docs": {
"name": "@ax/st-docs",
"version": "7.1.87",
"integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz",
"dependencies": {}
},
"@ax/system-strings": {
"name": "@ax/system-strings",
"version": "7.1.47",
Expand Down Expand Up @@ -679,13 +686,6 @@
],
"dependencies": {}
},
"@ax/st-docs": {
"name": "@ax/st-docs",
"version": "7.1.87",
"integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz",
"dependencies": {}
},
"@ax/system-math": {
"name": "@ax/system-math",
"version": "7.1.47",
Expand Down
2 changes: 1 addition & 1 deletion src/tests.integrations/integrated/src/integrated.twin/Entry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ private static bool CertificateValidation(HttpRequestMessage requestMessage, X50

public static integratedTwinController Plc { get; }
= new(ConnectorAdapterBuilder.Build()
.CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USER_NAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true));
.CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USERNAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true));
}
}