Skip to content

build: update unit tests and dependencies for improved assertions and functionality #191

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

build: update unit tests and dependencies for improved assertions and functionality #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a947d1a
Update unit tests and dependencies for improved assertions and functi…
runejo Oct 22, 2025
0b59b6c
Remove unused variables from ParserTest methods for cleaner code
runejo Oct 23, 2025
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
40 changes: 19 additions & 21 deletions ManualTests/CodelistsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void TestElimAValueSet()
[TestMethod]
public void TestBadValueSet()
{
var exception = Assert.ThrowsException<ApplicationException>(() => ApiUtilStatic.GetValueSet(_badVS, "en"));
var exception = Assert.ThrowsExactly<ApplicationException>(() => ApiUtilStatic.GetValueSet(_badVS, "en"));

StringAssert.StartsWith(exception.Message, "ValueSet NoSuchVS not found for language ");
}
Expand All @@ -85,50 +85,50 @@ public void TestOkValueSet()

PCAxis.Sql.Models.ValueSet actual_data = ApiUtilStatic.GetValueSet(getId, _mainLanguage);
Assert.IsNotNull(actual_data);
Assert.AreEqual(2, actual_data.AvailableLanguages.Count);
Assert.IsTrue(actual_data.AvailableLanguages.Contains(_mainLanguage));
Assert.IsTrue(actual_data.AvailableLanguages.Contains("en"));
Assert.HasCount(2, actual_data.AvailableLanguages);
Assert.Contains(_mainLanguage, actual_data.AvailableLanguages);
Assert.Contains("en", actual_data.AvailableLanguages);

Assert.AreEqual(actual_data.Id, getId);
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Label));
Assert.IsTrue(actual_data.Values.Count > 0);
Assert.IsNotEmpty(actual_data.Values);
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Values[0].Code));
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Values[0].Text));


actual_data = ApiUtilStatic.GetValueSet(getId, "en");
Assert.IsNotNull(actual_data);
Assert.AreEqual(2, actual_data.AvailableLanguages.Count);
Assert.IsTrue(actual_data.AvailableLanguages.Contains(_mainLanguage));
Assert.IsTrue(actual_data.AvailableLanguages.Contains("en"));
Assert.HasCount(2, actual_data.AvailableLanguages);
Assert.Contains(_mainLanguage, actual_data.AvailableLanguages);
Assert.Contains("en", actual_data.AvailableLanguages);

Assert.AreEqual(actual_data.Id, getId);
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Label));
Assert.IsTrue(actual_data.Values.Count > 0);
Assert.IsNotEmpty(actual_data.Values);
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Values[0].Code));
Assert.IsFalse(String.IsNullOrEmpty(actual_data.Values[0].Text));
Assert.AreEqual(_okVS_values, actual_data.Values.Count);
Assert.HasCount(_okVS_values, actual_data.Values);
}



[TestMethod]
public void TestGetGrouping()
{
//string getId = "AlleAldre48e3"; // pres I 1 mother 5 children
//string getId = "AlleAldre48e3"; // pres I 1 mother 5 children
//string getId = "GrkretsBydel2002";
//string getId = "KommSummer"; //tab 07459 pres A
//string getId = "AlleVUtd"; // pres I 12 mother 118 children
//string getId = "AlleVUtd"; // pres I 12 mother 118 children
string getId = _okGrouping;



PCAxis.Sql.Models.Grouping actual_data = ApiUtilStatic.GetGrouping(getId, _mainLanguage);

Assert.IsNotNull(actual_data);
Assert.AreEqual(2, actual_data.AvailableLanguages.Count);
Assert.IsTrue(actual_data.AvailableLanguages.Contains(_mainLanguage));
Assert.IsTrue(actual_data.AvailableLanguages.Contains("en"));
Assert.HasCount(2, actual_data.AvailableLanguages);
Assert.Contains(_mainLanguage, actual_data.AvailableLanguages);
Assert.Contains("en", actual_data.AvailableLanguages);

PCAxis.Sql.Models.Grouping data_en = ApiUtilStatic.GetGrouping(getId, "en");
Assert.IsNotNull(data_en);
Expand All @@ -145,7 +145,7 @@ public void TestSSBSortedSelectionGrouping()
PCAxis.Sql.Models.Grouping actual_data = ApiUtilStatic.GetGrouping(getId, "en");

Assert.IsNotNull(actual_data);
Assert.AreEqual(423, actual_data.Values.Count);
Assert.HasCount(423, actual_data.Values);
Assert.AreEqual("Municipalities 2018-2019", actual_data.Label);
Assert.AreEqual("0101", actual_data.Values[0].Code);
Assert.AreEqual("Halden (-2019)", actual_data.Values[0].Text);
Expand All @@ -162,9 +162,8 @@ public void TestValidNames()
// ArgumentException means invalid id (cannot exists in any db)
// ApplicationException means not found (does no exist in this db)

string vsId = "Spa3ce ok. _ :sdfsdDSÆØ";
Assert.ThrowsException<ApplicationException>(() => ApiUtilStatic.GetValueSet(vsId, "en")
);
string vsId = "Spa3ce ok. _ :sdfsdDS��";
Assert.ThrowsExactly<ApplicationException>(() => ApiUtilStatic.GetValueSet(vsId, "en"));

List<string> badIds = new();
badIds.Add("Bad id Semicolon'4");
Expand All @@ -177,8 +176,7 @@ public void TestValidNames()

foreach (string badId in badIds)
{
Assert.ThrowsException<ArgumentException>(() => ApiUtilStatic.GetValueSet(badId, "en"), "Does not fail for: " + badId
);
Assert.ThrowsExactly<ArgumentException>(() => ApiUtilStatic.GetValueSet(badId, "en"), "Does not fail for: " + badId);
}


Expand Down
2 changes: 1 addition & 1 deletion ManualTests/ConfigTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void TestGetsDefaultDatabase()
{
var dbConf = SqlDbConfigsStatic.DefaultDatabase;
var langCount = dbConf.GetAllLanguages().Count;
Assert.IsTrue(langCount > 1);
Assert.IsGreaterThan(1, langCount);
}

}
Expand Down
4 changes: 2 additions & 2 deletions ManualTests/ManualTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 1 addition & 3 deletions ManualTests/ParserTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void Test3()

Assert.IsNotNull(builder.Model);
int expectedVarieblesCount = 3;
Assert.AreEqual(expectedVarieblesCount, builder.Model.Meta.Variables.Count);
Assert.HasCount(expectedVarieblesCount, builder.Model.Meta.Variables);
int expectedMatrixSize = 932;
Assert.AreEqual(expectedMatrixSize, builder.Model.Data.MatrixSize);
}
Expand Down Expand Up @@ -96,7 +96,6 @@ public void TestAnnual()
mTimeScale = builder.Model.Meta.Variables[1].TimeScale;
Assert.AreEqual(TimeScaleType.Annual, mTimeScale);
Assert.IsNotNull(builder.Model);
string actual = "";

}

Expand Down Expand Up @@ -140,7 +139,6 @@ public void TestWeeklyGapInTime()
builder.SetPath(dbId);
builder.SetPreferredLanguage(myLang);
builder.BuildForSelection();
int timeIndex = 2;

var mTimeScale = builder.Model.Meta.Variables[2].TimeScale;
Assert.AreEqual(TimeScaleType.Weekly, mTimeScale);
Expand Down
4 changes: 3 additions & 1 deletion ManualTests/Usings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
global using Microsoft.VisualStudio.TestTools.UnitTesting;
global using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
3 changes: 2 additions & 1 deletion PCAxis.Sql.UnitTest/ColTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

using PCAxis.Sql.DbConfig;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace PCAxis.Sql.UnitTest
{
Expand Down Expand Up @@ -129,7 +130,7 @@ public void IsUppered_GivenTableCol_ReturnsUpperedSQLPartExpresssion()
[TestCategory("Unit")]
public void Is_GivenTwoCol_ReturnsIdEqualSQLPartExpresssion()
{
//Arrange
//Arrange
var col = new Col("ColName", "TableAlias");
var col2 = new Col("ColName", "TableAlias2");

Expand Down
4 changes: 2 additions & 2 deletions PCAxis.Sql.UnitTest/SqlDbEncrypterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public void EncryptShouldReturnFalse()


//Assert
Assert.AreEqual(result, false);
Assert.IsFalse(result);

}
}
}
}
7 changes: 4 additions & 3 deletions PCAxis.Sql/PCAxis.Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -46,9 +46,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.280" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.290" />
<PackageReference Include="PCAxis.Core" Version="1.2.7" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading