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

Task/rdmp 19 fix codescanning #1818

Merged
merged 6 commits into from
May 1, 2024
Merged

Task/rdmp 19 fix codescanning #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61a6e1d
add codeql config
JFriel May 1, 2024
453114a
dont double init
JFriel May 1, 2024
3d9d24a
tidy up config file
JFriel May 1, 2024
0ec5665
Merge branch 'develop' of https://github.com/HicServices/RDMP into ta…
JFriel May 1, 2024
7e968f8
ignore .designer in codeql
JFriel May 1, 2024
cf6d4ee
remove number identifier
JFriel May 1, 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
5 changes: 3 additions & 2 deletions .github/configs/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ name: CodeQL Configuration
paths-ignore:
- "**/*.md"
- "**/*.txt"
- "**/obj/**/*.*"
- "**/bin/**/*.*"
- "**/obj/**"
- "**/bin/**"
- "**/*.Designer.cs"

query-filters:
- exclude:
Expand Down
3 changes: 0 additions & 3 deletions Rdmp.Core.Tests/CommandExecution/ExecuteCommandLinkCoulmnInfoWithDatasetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public void TestLinkColumnInfoToDataset()
var cmd = new ExecuteCommandCreateDataset(GetMockActivator(), "dataset");
Assert.DoesNotThrow(() => cmd.Execute());
var founddataset = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<Core.Curation.Data.Dataset>().First();
var foundCatalogue = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Where(c => c.Name == "Dataset1").First();
var linkCmd = new ExecuteCommandLinkColumnInfoToDataset(GetMockActivator(), _c1, founddataset);
Assert.DoesNotThrow(() => linkCmd.Execute());
var columInfo = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<ColumnInfo>();
Expand Down Expand Up @@ -69,7 +68,6 @@ public void TestLinkColumnInfoToDatasetNotAll()
var cmd = new ExecuteCommandCreateDataset(GetMockActivator(), "dataset");
Assert.DoesNotThrow(() => cmd.Execute());
var founddataset = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<Core.Curation.Data.Dataset>().First();
var foundCatalogue = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Where(c => c.Name == "Dataset1").First();
var linkCmd = new ExecuteCommandLinkColumnInfoToDataset(GetMockActivator(), _c1, founddataset, false);
Assert.DoesNotThrow(() => linkCmd.Execute());
var columInfo = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<CatalogueItem>().Where(ci => _cata1.CatalogueItems.Contains(ci));
Expand Down Expand Up @@ -99,7 +97,6 @@ public void TestLinkColumInfoToDatasetBadDataset()
{
var cmd = new ExecuteCommandCreateDataset(GetMockActivator(), "dataset");
Assert.DoesNotThrow(() => cmd.Execute());
var founddataset = GetMockActivator().RepositoryLocator.CatalogueRepository.GetAllObjects<Core.Curation.Data.Dataset>().First();
var linkCmd = new ExecuteCommandLinkColumnInfoToDataset(GetMockActivator(), new ColumnInfo(), null, false);
Assert.Throws<NullReferenceException>(() => linkCmd.Execute());
}
Expand Down
5 changes: 2 additions & 3 deletions Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ public class MetadataLoggingConfigurationChecksTests : UnitTests
public void Test_NoLoggingTask()
{
var lmd = WhenIHaveA<LoadMetadata>();
var cata1 = lmd.GetAllCatalogues().Single();
var cata2 = WhenIHaveA<Catalogue>();
lmd.LinkToCatalogue(cata2);
var cata = WhenIHaveA<Catalogue>();
lmd.LinkToCatalogue(cata);
Assert.That(lmd.GetAllCatalogues().Count(), Is.EqualTo(2));

var checks = new MetadataLoggingConfigurationChecks(lmd);
Expand Down