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

[ODS-6321] Update Npgsql and HealthChecks libraries #1016

Merged
merged 10 commits into from
Apr 4, 2024
Merged

[ODS-6321] Update Npgsql and HealthChecks libraries #1016

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7522f52
upgraded npgsql package
vimayya Apr 3, 2024
c2778ad
EnableLegacyTimestampBehavior after npgsql upgrade
vimayya Apr 3, 2024
055bb6b
Common package update
vimayya Apr 3, 2024
52dd52e
package updates
vimayya Apr 3, 2024
825ae51
bringing in ODS-5947
vimayya Apr 4, 2024
5267e04
HealthChecks package update
vimayya Apr 4, 2024
4978449
updated load tools to .net 6
vimayya Apr 4, 2024
e910868
Update test cases to not have space in category definition
vimayya Apr 4, 2024
986c53f
pulled a test fix from ODS-5350
vimayya Apr 4, 2024
a39722e
Fixed build warnings
vimayya Apr 4, 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
4 changes: 2 additions & 2 deletions Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Npgsql" Version="6.0.3" />
</ItemGroup>
<ItemGroup>
<None Include="../../LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
Expand Down
2 changes: 1 addition & 1 deletion Application/EdFi.Common/EdFi.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.1.1" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="3.1.1" />
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.105" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.143" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.1" />
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.256" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.250" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="FluentValidation" Version="8.6.3" />
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
Expand Down
4 changes: 2 additions & 2 deletions Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="FluentValidation" Version="8.6.3" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NHibernate" Version="5.3.10" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
Expand Down
4 changes: 2 additions & 2 deletions ...tion/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="Autofac" Version="6.3.0" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.250" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
Expand Down
1 change: 1 addition & 0 deletions Application/EdFi.Ods.Repositories.NHibernate.Tests/StudentProgramAssociationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public class When_upserting_student_program_and_derived_associations : TestFixtu

protected override void Arrange()
{
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
RegisterDependencies();
IDescriptorsCache cache = null;
DescriptorsCache.GetCache = () => cache ??= _container.Resolve<IDescriptorsCache>();
Expand Down
6 changes: 3 additions & 3 deletions Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.105" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.256" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
Expand Down
30 changes: 26 additions & 4 deletions Application/EdFi.Ods.Sandbox/Provisioners/PostgresSandboxProvisioner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Dapper;
using EdFi.Admin.DataAccess.Utils;
using EdFi.Common.Configuration;
using EdFi.Ods.Common.Configuration;
using log4net;
using Microsoft.Extensions.Configuration;
using Npgsql;
Expand All @@ -28,20 +27,43 @@ public override async Task RenameSandboxAsync(string oldName, string newName)
{
using (var conn = CreateConnection())
{
string sql =
$"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='{oldName}';ALTER DATABASE \"{oldName}\" RENAME TO \"{newName}\";";
string sql = $"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='{oldName}';";

await conn.ExecuteAsync(sql,commandTimeout: CommandTimeout)
.ConfigureAwait(false);

sql = $"ALTER DATABASE \"{oldName}\" RENAME TO \"{newName}\";";

await conn.ExecuteAsync(sql,commandTimeout: CommandTimeout)
.ConfigureAwait(false);
}
}

public override async Task DeleteSandboxesAsync(params string[] deletedClientKeys)
{
using (var conn = CreateConnection())
{
foreach (string key in deletedClientKeys)
{
await conn.ExecuteAsync(
$@"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='{_databaseNameBuilder.SandboxNameForKey(key)}';");

await conn.ExecuteAsync(
$@"DROP DATABASE IF EXISTS ""{_databaseNameBuilder.SandboxNameForKey(key)}"";",
commandTimeout: CommandTimeout)
.ConfigureAwait(false);
}
}
}

public override async Task CopySandboxAsync(string originalDatabaseName, string newDatabaseName)
{
using (var conn = CreateConnection())
{
string sql = $"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='{originalDatabaseName}';CREATE DATABASE \"{newDatabaseName}\" TEMPLATE \"{originalDatabaseName}\";";
string sql = @$"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='{originalDatabaseName}';";
await conn.ExecuteAsync(sql, commandTimeout: CommandTimeout).ConfigureAwait(false);

sql = @$"CREATE DATABASE ""{newDatabaseName}"" TEMPLATE ""{originalDatabaseName}""";
await conn.ExecuteAsync(sql, commandTimeout: CommandTimeout).ConfigureAwait(false);
}
}
Expand Down
14 changes: 3 additions & 11 deletions Application/EdFi.Ods.Sandbox/Provisioners/SandboxProvisionerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public void AddSandbox(string sandboxKey, SandboxType sandboxType)

public async Task AddSandboxAsync(string sandboxKey, SandboxType sandboxType)
{
await DeleteSandboxesAsync(sandboxKey).ConfigureAwait(false);

switch (sandboxType)
{
case SandboxType.Minimal:
Expand All @@ -77,17 +79,7 @@ await CopySandboxAsync(
}
}

public async Task DeleteSandboxesAsync(params string[] deletedClientKeys)
{
using (var conn = CreateConnection())
{
foreach (string key in deletedClientKeys)
{
await conn.ExecuteAsync($"DROP DATABASE IF EXISTS {_databaseNameBuilder.SandboxNameForKey(key)};", commandTimeout: CommandTimeout)
.ConfigureAwait(false);
}
}
}
public abstract Task DeleteSandboxesAsync(params string[] deletedClientKeys);

public abstract Task<SandboxStatus> GetSandboxStatusAsync(string clientKey);

Expand Down
18 changes: 18 additions & 0 deletions Application/EdFi.Ods.Sandbox/Provisioners/SqlServerSandboxProvisioner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,24 @@ public override async Task<SandboxStatus> GetSandboxStatusAsync(string clientKey
}
}

public override async Task DeleteSandboxesAsync(params string[] deletedClientKeys)
{
using (var conn = CreateConnection())
{
foreach (string key in deletedClientKeys)
{
await conn.ExecuteAsync($@"
IF EXISTS (SELECT name from sys.databases WHERE (name = '{_databaseNameBuilder.SandboxNameForKey(key)}'))
BEGIN
ALTER DATABASE [{_databaseNameBuilder.SandboxNameForKey(key)}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
DROP DATABASE [{_databaseNameBuilder.SandboxNameForKey(key)}];
END;
", commandTimeout: CommandTimeout)
.ConfigureAwait(false);
}
}
}

public override async Task CopySandboxAsync(string originalDatabaseName, string newDatabaseName)
{
using (var conn = CreateConnection())
Expand Down
6 changes: 3 additions & 3 deletions Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.105" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.256" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.250" />
<PackageReference Include="NHibernate" Version="5.3.10" />
<PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="CompareNETObjects" Version="4.74.0" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="EntityFrameworkTesting.FakeItEasy" Version="1.3.0" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
<PackageReference Include="Npgsql" Version="4.1.5" />
<PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion Application/EdFi.TestObjects/EdFi.TestObjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="NUnit" Version="3.13.2" />
Expand Down
2 changes: 1 addition & 1 deletion Application/Test.Common/Test.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.143" />
<PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.250" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
14 changes: 7 additions & 7 deletions Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RestorePackages>true</RestorePackages>
<Configurations>Debug;Release</Configurations>
Expand Down Expand Up @@ -38,13 +38,13 @@
<PackageReference Include="Autofac" Version="6.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.3.18" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.10" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.10" />
</ItemGroup>
<ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>EdFi.LoadTools.Test</AssemblyName>
<RootNamespace>EdFi.LoadTools.Test</RootNamespace>
<Copyright>Copyright © 2020 Ed-Fi Alliance, LLC and Contributors</Copyright>
Expand All @@ -21,13 +21,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="aqua-graphcompare" Version="1.2.2" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.3.18" />
<PackageReference Include="EdFi.Suite3.Common" Version="5.4.247" />
<PackageReference Include="EdFi.Suite3.OdsApi.TestSdk" Version="5.3.243" />
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.8" />
<PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.8" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="3.1.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion Utilities/DataLoading/EdFi.LoadTools.Test/JsonMetadataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static IInterchangeOrderConfiguration InterchangeOrderConfiguration
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_display_all_Json_metadata()
{
var loader = new SwaggerMetadataRetriever(
Expand Down
2 changes: 1 addition & 1 deletion ...g/EdFi.LoadTools.Test/MappingFactories/LookupToGetByExampleMetadataMappingFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void SetUp()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_map_lookup_to_getByExample()
{
foreach (var m in _mappings.OrderBy(x => x.SourceName))
Expand Down
2 changes: 1 addition & 1 deletion ...ading/EdFi.LoadTools.Test/MappingFactories/LookupToIdentityMetadataMappingFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void Setup()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_map_lookup_to_identity()
{
foreach (var mapping in _mappings.OrderBy(x => x.SourceName))
Expand Down
2 changes: 1 addition & 1 deletion ...ing/EdFi.LoadTools.Test/MappingFactories/ResourceToIdentityMetadataMappingFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void Setup()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_map_resource_to_identity()
{
foreach (var mapping in _mappings.OrderBy(x => x.SourceName))
Expand Down
2 changes: 1 addition & 1 deletion ...ing/EdFi.LoadTools.Test/MappingFactories/ResourceToResourceMetadataMappingFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void SetUp()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_map_resource_to_resource()
{
foreach (var m in _mappings.OrderBy(x => x.SourceName))
Expand Down
4 changes: 2 additions & 2 deletions Utilities/DataLoading/EdFi.LoadTools.Test/OAuthTokenHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace EdFi.LoadTools.Test
{
/// <summary>
/// These tests are meant to be run manually with a functioning API
/// These tests are meant to be RunManually with a functioning API
/// </summary>
[TestFixture]
public class OAuthTokenHandlerTests
Expand All @@ -31,7 +31,7 @@ public void Setup()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void ShouldSuccessfullyRetrieveBearerToken()
{
var config = new TestOAuthConfiguration
Expand Down
2 changes: 1 addition & 1 deletion Utilities/DataLoading/EdFi.LoadTools.Test/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*Testing Instructions
The tests labeled as "Run Manually" require a running Ed-Fi ODS API with a known key and secret. Configuration for these tests may be changed in the app.config file of this project.
The tests labeled as "RunManually" require a running Ed-Fi ODS API with a known key and secret. Configuration for these tests may be changed in the app.config file of this project.
4 changes: 2 additions & 2 deletions Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/ModelDependencySortTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void Should_resolve_longer_reference()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_order_types_from_Sdk()
{
var cat = new SdkCategorizer(SdkLibraryFactory);
Expand All @@ -100,7 +100,7 @@ public void Should_order_types_from_Sdk()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public void Should_order_Apis_from_Sdk()
{
var cat = new SdkCategorizer(SdkLibraryFactory);
Expand Down
2 changes: 1 addition & 1 deletion Utilities/DataLoading/EdFi.LoadTools.Test/SwaggerRetrieverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void SetUp()
}

[Test]
[Category("Run Manually")]
[Category("RunManually")]
public async Task Should_retrieve_swagger_information()
{
var retriever = new SwaggerRetriever(new TestApiMetadataConfiguration(_configuration));
Expand Down
Loading
Loading