Skip to content

Commit

Permalink
chore(e2e-testing): prepare for merge
Browse files Browse the repository at this point in the history
- fix obsolete model reference
- set AssemblyName and RootNamespace
- fix packagereference and namespace in a couple of files
- add file header
- update reportportal package
- update dependencies
  • Loading branch information
evegufy committed Sep 21, 2023
1 parent 1504e56 commit 63c2a9f
Show file tree
Hide file tree
Showing 37 changed files with 674 additions and 57 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ jobs:
- name: Update JSON file
env:
project: ${{ secrets.REPORTPORTAL_PROJECT }}
uuid: ${{ secrets.REPORTPORTAL_AUTHENTICATION_UUID }}
apiKey: ${{ secrets.REPORTPORTAL_AUTHENTICATION_UUID }}
url: ${{ vars.REPORTPORTAL_URL }}
run: |
cd tests/endtoend
jq --arg project "$project" \
--arg uuid "$uuid" \
--arg apiKey "$apiKey" \
--arg url "$url" \
'.server |= ( .project = $project | .authentication.uuid = $uuid | .url = $url )' \
'.server |= ( .project = $project | .apiKey = $apiKey | .url = $url )' \
ReportPortal.config.json > temp.json
mv temp.json ReportPortal.config.json
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
Expand Down
7 changes: 3 additions & 4 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@ nuget/nuget/-/NHamcrest/3.2.0, MIT, approved, #9299
nuget/nuget/-/NJsonSchema/10.9.0, MIT, approved, #9300
nuget/nuget/-/Namotion.Reflection/2.1.2, MIT, approved, #9320
nuget/nuget/-/Newtonsoft.Json/12.0.2, MIT, approved, clearlydefined
nuget/nuget/-/Newtonsoft.Json/13.0.2, MIT AND BSD-3-Clause, approved, #3266
nuget/nuget/-/Newtonsoft.Json/13.0.1, MIT AND BSD-3-Clause, approved, #3266
nuget/nuget/-/Newtonsoft.Json/13.0.3, MIT AND BSD-3-Clause, approved, #3266
nuget/nuget/-/Newtonsoft.Json/9.0.1, MIT, approved, clearlydefined
nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/7.0.4, PostgreSQL AND MIT AND Apache-2.0, approved, #10081
nuget/nuget/-/Npgsql/7.0.4, PostgreSQL, approved, #10062
nuget/nuget/-/PasswordGenerator/2.1.0, MIT, approved, #3192
nuget/nuget/-/Portable.BouncyCastle/1.9.0, MIT, approved, clearlydefined
nuget/nuget/-/ReportPortal.Client/3.4.0, Apache-2.0, approved, #9298
nuget/nuget/-/ReportPortal.Shared/3.5.0, Apache-2.0, approved, #9301
nuget/nuget/-/ReportPortal.XUnit/2.4.5, Apache-2.0, approved, #9296
nuget/nuget/-/ReportPortal.Shared/3.6.0, Apache-2.0, approved, #10587
nuget/nuget/-/ReportPortal.XUnit/2.5.0, Apache-2.0, approved, #10588
nuget/nuget/-/RestAssured.Net/4.0.0, Apache-2.0, approved, #9294
nuget/nuget/-/SSH.NET/2020.0.2, MIT AND ISC AND LicenseRef-Public-domain AND (MIT AND MS-PL), approved, #10073
nuget/nuget/-/Serilog.AspNetCore/7.0.0, Apache-2.0 AND MIT, approved, #10084
Expand Down
29 changes: 15 additions & 14 deletions src/Portal.Backend.sln
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models.Tests", ".
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ProcessIdentity", "framework\Framework.ProcessIdentity\Framework.ProcessIdentity.csproj", "{4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}"
EmdProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd.Tests", "..\tests\endtoend\EndToEnd.Tests.csproj", "{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.PublicInfos", "framework\Framework.PublicInfos\Framework.PublicInfos.csproj", "{47E089E3-E875-4045-9E58-C1223BE899E9}"
EndProject
Expand All @@ -228,6 +227,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkRegistration.Library
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkRegistration.Executor", "..\tests\processes\NetworkRegistration.Executor\NetworkRegistration.Executor.csproj", "{469F8BD7-C2A7-4C5B-8280-095C7102E60E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd.Tests", "..\tests\endtoend\EndToEnd.Tests.csproj", "{D22934D7-59B7-4779-AB59-E5BE12DE2F06}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1354,18 +1355,6 @@ Global
{A5BEDD89-7280-466E-8D14-EC5E177AAD07}.Release|x64.Build.0 = Release|Any CPU
{A5BEDD89-7280-466E-8D14-EC5E177AAD07}.Release|x86.ActiveCfg = Release|Any CPU
{A5BEDD89-7280-466E-8D14-EC5E177AAD07}.Release|x86.Build.0 = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|x64.Build.0 = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|x86.ActiveCfg = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Debug|x86.Build.0 = Debug|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|Any CPU.Build.0 = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|x64.ActiveCfg = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|x64.Build.0 = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|x86.ActiveCfg = Release|Any CPU
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB}.Release|x86.Build.0 = Release|Any CPU
{6113B579-C995-47F8-9AC1-4CC6EFDDD883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6113B579-C995-47F8-9AC1-4CC6EFDDD883}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6113B579-C995-47F8-9AC1-4CC6EFDDD883}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1438,6 +1427,18 @@ Global
{469F8BD7-C2A7-4C5B-8280-095C7102E60E}.Release|x64.Build.0 = Release|Any CPU
{469F8BD7-C2A7-4C5B-8280-095C7102E60E}.Release|x86.ActiveCfg = Release|Any CPU
{469F8BD7-C2A7-4C5B-8280-095C7102E60E}.Release|x86.Build.0 = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|x64.ActiveCfg = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|x64.Build.0 = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|x86.ActiveCfg = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Debug|x86.Build.0 = Debug|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|Any CPU.Build.0 = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|x64.ActiveCfg = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|x64.Build.0 = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|x86.ActiveCfg = Release|Any CPU
{D22934D7-59B7-4779-AB59-E5BE12DE2F06}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1540,11 +1541,11 @@ Global
{47E089E3-E875-4045-9E58-C1223BE899E9} = {23500169-FC01-4D2B-A997-E7FAE2169FC0}
{9D574E57-75A6-4965-AF23-ACE0BB9CD0B3} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
{E1D41A07-F468-4D13-8185-35F127230B17} = {46383371-8252-4598-9350-A97692851408}
{5D70E30D-E9A2-472B-9834-BDB9824F8DEB} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
{6113B579-C995-47F8-9AC1-4CC6EFDDD883} = {68D43DB1-DFC5-4F15-A2B4-6BA18B875F9E}
{19639645-A115-4824-865F-5559DA8B892A} = {282CEF03-292F-4A49-83C6-997567D0FF5F}
{3B41408A-CDFE-4EEE-9660-FE6755FD2075} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
{C53EAB34-1F66-48F8-88AB-226BE142D1CF} = {282CEF03-292F-4A49-83C6-997567D0FF5F}
{469F8BD7-C2A7-4C5B-8280-095C7102E60E} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
{D22934D7-59B7-4779-AB59-E5BE12DE2F06} = {323C198D-A8C6-4EB0-8B79-72624275E35F}
EndGlobalSection
EndGlobal
19 changes: 19 additions & 0 deletions tests/endtoend/AlphabeticalOrderer.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
Expand Down
21 changes: 20 additions & 1 deletion tests/endtoend/AuthFlow/AuthFlow.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
using EndToEnd.Tests;
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using HtmlAgilityPack;
using Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
using System.Text.RegularExpressions;
using System.Web;
using static RestAssured.Dsl;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/AuthFlow/CentralidpCompany.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;

public record CentralidpCompany(
Expand Down
21 changes: 20 additions & 1 deletion tests/endtoend/AuthFlow/DevMailApiRequests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
using EndToEnd.Tests;
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using HtmlAgilityPack;
using MimeKit;
using Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
using System.Text;
using System.Web;
using Xunit;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/AuthFlow/DevMailboxData.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using System.Text.Json.Serialization;

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/AuthFlow/EmailMessageData.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using System.Text.Json.Serialization;

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/AuthFlow/MailboxData.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;

public record MailboxData(
Expand Down
21 changes: 20 additions & 1 deletion tests/endtoend/AuthFlow/TempMailApiRequests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
using EndToEnd.Tests;
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using HtmlAgilityPack;
using Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
using System.Security.Cryptography;
using System.Text;
using System.Web;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/AuthFlow/Token.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using System.Text.Json.Serialization;

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
Expand Down
19 changes: 19 additions & 0 deletions tests/endtoend/ConsoleWriter.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using Xunit.Abstractions;

namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
Expand Down
23 changes: 21 additions & 2 deletions tests/endtoend/CreateAppScenario/CreateNewTestAppScenario.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

using Castle.Core.Internal;
using EndToEnd.Tests;
using FluentAssertions;
using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels;
using Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models;
using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
Expand Down Expand Up @@ -96,7 +115,7 @@ public static IEnumerable<object[]> GetDataEntries
{
yield return new object[] { t };
}
}
}
}

private static bool ValidateStorageOfAppDetailData(AppRequestModel newAppRequest,
Expand Down
Loading

0 comments on commit 63c2a9f

Please sign in to comment.