6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

4.17

/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExplicitTypingCollection.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Xml;
using Rdmp.Core.Curation.Data.DataLoad;

namespace Rdmp.Core.DataLoad.Modules.DataFlowSources;

/// <summary>
/// A collection of column names with explicitly defined column types that the user wants to force where present.  e.g. they loading a CSV and they get values
/// "291","195" but they know that some codes are like "012" and wish to preserve this leading 0s so they can explicitly define the column as being a string.
/// 
/// <para>This class can be used by [DemandsInitialization] properties and it will launch its custom UI: ExplicitTypingCollectionUI</para>
/// </summary>
public class ExplicitTypingCollection : ICustomUIDrivenClass
{
    /// <summary>
    /// A dictionary of names (e.g. column names) which must have specific C# data types
    /// </summary>
    public Dictionary<string, Type> ExplicitTypesCSharp = new();

    /// <inheritdoc/>
    public void RestoreStateFrom(string value)
    {
        if (value == null)
            return;

        var doc = new XmlDocument();
        doc.Load(new StringReader(value));


        //get the dictionary tag
        var typesNode = doc.GetElementsByTagName("ExplicitTypesCSharp").Cast<XmlNode>().Single();
        var dictionary = typesNode.InnerText;

        var lines = dictionary.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);

        for (var i = 0; i < lines.Length; i += 2)
            ExplicitTypesCSharp.Add(lines[i], Type.GetType(lines[i + 1]));
    }

    /// <inheritdoc/>
    public string SaveStateToString()
    {
        var sb = new StringBuilder();

        //Add anything new here

        sb.AppendLine("<ExplicitTypesCSharp>");
        foreach (var kvp in ExplicitTypesCSharp)
        {
            sb.AppendLine(kvp.Key);
            sb.AppendLine(kvp.Value.FullName);
        }

        sb.AppendLine("</ExplicitTypesCSharp>");

        return sb.ToString();
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using System.Collections.Generic;
9	using System.IO;
10	using System.Linq;
11	using System.Text;
12	using System.Xml;
13	using Rdmp.Core.Curation.Data.DataLoad;
14
15	namespace Rdmp.Core.DataLoad.Modules.DataFlowSources;
16
17	/// <summary>
18	/// A collection of column names with explicitly defined column types that the user wants to force where present. e.g. they loading a CSV and they get values
19	/// "291","195" but they know that some codes are like "012" and wish to preserve this leading 0s so they can explicitly define the column as being a string.
20	///
21	/// <para>This class can be used by [DemandsInitialization] properties and it will launch its custom UI: ExplicitTypingCollectionUI</para>
22	/// </summary>
23	public class ExplicitTypingCollection : ICustomUIDrivenClass
24	{
25	/// <summary>
26	/// A dictionary of names (e.g. column names) which must have specific C# data types
27	/// </summary>
28	public Dictionary<string, Type> ExplicitTypesCSharp = new();	2✔
29
30	/// <inheritdoc/>
31	public void RestoreStateFrom(string value)
32	{
33	if (value == null)	×
34	return;	×
35
36	var doc = new XmlDocument();	×
37	doc.Load(new StringReader(value));	×
38
39
40	//get the dictionary tag
41	var typesNode = doc.GetElementsByTagName("ExplicitTypesCSharp").Cast<XmlNode>().Single();	×
42	var dictionary = typesNode.InnerText;	×
43
44	var lines = dictionary.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);	×
45
46	for (var i = 0; i < lines.Length; i += 2)	×
47	ExplicitTypesCSharp.Add(lines[i], Type.GetType(lines[i + 1]));	×
48	}	×
49
50	/// <inheritdoc/>
51	public string SaveStateToString()
52	{
53	var sb = new StringBuilder();	×
54
55	//Add anything new here
56
57	sb.AppendLine("<ExplicitTypesCSharp>");	×
58	foreach (var kvp in ExplicitTypesCSharp)	×
59	{
60	sb.AppendLine(kvp.Key);	×
61	sb.AppendLine(kvp.Value.FullName);	×
62	}
63
64	sb.AppendLine("</ExplicitTypesCSharp>");	×
65
66	return sb.ToString();	×
67	}
68	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous