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

87.5

/Rdmp.Core/ReusableLibraryCode/Exceptions/ExpectedIdenticalStringsException.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.Text;

namespace Rdmp.Core.ReusableLibraryCode.Exceptions;

/// <summary>
/// Thrown when two strings that were expected to be identical are different.  Includes ASCII art to show where they are different.
/// </summary>
public class ExpectedIdenticalStringsException : Exception
{
    public string Expected { get; set; }
    public string Actual { get; set; }

    public ExpectedIdenticalStringsException(string message, string expected, string actual)
        : base(AssembleMessage(message, expected, actual))
    {
        Expected = expected;
        Actual = actual;
    }

    private static string AssembleMessage(string message, string expected, string actual)
    {
        if (string.IsNullOrWhiteSpace(expected) || string.IsNullOrWhiteSpace(actual))
            return message;

        expected = expected.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");
        actual = actual.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");

        for (var i = 0; i < expected.Length; i++)
        {
            if (!(i < actual.Length))
                return
                    $"{message}{Environment.NewLine}Strings are identical except that Actual string ends at character {i} while we still Expected {expected.Length - actual.Length} additional characters";

            //give them a preview of the location of the difference
            if (expected[i].Equals(actual[i])) continue;

            return $"{message}{Environment.NewLine}Strings differ at index {i}{GetPreviewsAround(i, expected, actual)}";
        }

        return
            $"{message}{Environment.NewLine}Strings are identical except that Expected string ends at character {expected.Length} while the Actual string had {actual.Length - expected.Length} additional characters{GetPreviewsAround(expected.Length, expected, actual)}";
    }

    private static string GetPreviewsAround(int i, string expected, string actual)
    {
        var previewExpected = GetPreviewAround(i, expected, out _);
        var previewActual = GetPreviewAround(i, actual, out var iIsAtCharacterPosition);

        var toReturn =
            new StringBuilder(
                $"{Environment.NewLine}EXPECTED:{previewExpected}{Environment.NewLine}ACTUAL  :{previewActual}{Environment.NewLine}");

        toReturn.Append('-', iIsAtCharacterPosition + "EXPECTED:".Length);
        toReturn.Append('^');
        return toReturn.ToString();
    }

    private static string GetPreviewAround(int i, string str, out int iIsAtCharacterPosition)
    {
        const int charsBefore = 20;
        const int charsAfter = 10;

        //Do not start preview before the beginning of the string e.g. if difference is at index 3 then start at 0 not -17
        var startSubstringAt = Math.Max(0, i - charsBefore);
        iIsAtCharacterPosition =
            i - startSubstringAt; //if difference is at index 350 then return 350 - (350-20) i.e. 20 but if difference is at index 3 then return 3 - 0 (see Math.Max on line above)

        var lengthWeWantToTake =
            i - startSubstringAt +
            charsAfter; //usually the full amount unless charsBefore is truncated due to the start of the string (when difference is early in the string)
        var lengthAvailable = str.Length - startSubstringAt;
        var lengthWeWillActuallyTake = Math.Min(lengthWeWantToTake, lengthAvailable);


        //if there is more available in the string put a ... so user knows it
        return
            $"{str.Substring(startSubstringAt, lengthWeWillActuallyTake)}{(lengthAvailable > lengthWeWillActuallyTake ? "..." : "")}";
    }
}

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.Text;
9
10	namespace Rdmp.Core.ReusableLibraryCode.Exceptions;
11
12	/// <summary>
13	/// Thrown when two strings that were expected to be identical are different. Includes ASCII art to show where they are different.
14	/// </summary>
15	public class ExpectedIdenticalStringsException : Exception
16	{
17	public string Expected { get; set; }	70✔
18	public string Actual { get; set; }	70✔
19
20	public ExpectedIdenticalStringsException(string message, string expected, string actual)
21	: base(AssembleMessage(message, expected, actual))	70✔
22	{
23	Expected = expected;	70✔
24	Actual = actual;	70✔
25	}	70✔
26
27	private static string AssembleMessage(string message, string expected, string actual)
28	{
29	if (string.IsNullOrWhiteSpace(expected) \|\| string.IsNullOrWhiteSpace(actual))	70!
30	return message;	×
31
32	expected = expected.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");	70✔
33	actual = actual.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");	70✔
34
35	for (var i = 0; i < expected.Length; i++)	13,554✔
36	{
37	if (!(i < actual.Length))	6,775!
38	return	×
39	$"{message}{Environment.NewLine}Strings are identical except that Actual string ends at character {i} while we still Expected {expected.Length - actual.Length} additional characters";	×
40
41	//give them a preview of the location of the difference
42	if (expected[i].Equals(actual[i])) continue;	6,775✔
43
44	return $"{message}{Environment.NewLine}Strings differ at index {i}{GetPreviewsAround(i, expected, actual)}";	68✔
45	}
46
47	return	2✔
48	$"{message}{Environment.NewLine}Strings are identical except that Expected string ends at character {expected.Length} while the Actual string had {actual.Length - expected.Length} additional characters{GetPreviewsAround(expected.Length, expected, actual)}";	2✔
49	}
50
51	private static string GetPreviewsAround(int i, string expected, string actual)
52	{
53	var previewExpected = GetPreviewAround(i, expected, out _);	70✔
54	var previewActual = GetPreviewAround(i, actual, out var iIsAtCharacterPosition);	70✔
55
56	var toReturn =	70✔
57	new StringBuilder(	70✔
58	$"{Environment.NewLine}EXPECTED:{previewExpected}{Environment.NewLine}ACTUAL :{previewActual}{Environment.NewLine}");	70✔
59
60	toReturn.Append('-', iIsAtCharacterPosition + "EXPECTED:".Length);	70✔
61	toReturn.Append('^');	70✔
62	return toReturn.ToString();	70✔
63	}
64
65	private static string GetPreviewAround(int i, string str, out int iIsAtCharacterPosition)
66	{
67	const int charsBefore = 20;
68	const int charsAfter = 10;
69
70	//Do not start preview before the beginning of the string e.g. if difference is at index 3 then start at 0 not -17
71	var startSubstringAt = Math.Max(0, i - charsBefore);	140✔
72	iIsAtCharacterPosition =	140✔
73	i - startSubstringAt; //if difference is at index 350 then return 350 - (350-20) i.e. 20 but if difference is at index 3 then return 3 - 0 (see Math.Max on line above)	140✔
74
75	var lengthWeWantToTake =	140✔
76	i - startSubstringAt +	140✔
77	charsAfter; //usually the full amount unless charsBefore is truncated due to the start of the string (when difference is early in the string)	140✔
78	var lengthAvailable = str.Length - startSubstringAt;	140✔
79	var lengthWeWillActuallyTake = Math.Min(lengthWeWantToTake, lengthAvailable);	140✔
80
81
82	//if there is more available in the string put a ... so user knows it
83	return	140✔
84	$"{str.Substring(startSubstringAt, lengthWeWillActuallyTake)}{(lengthAvailable > lengthWeWillActuallyTake ? "..." : "")}";	140✔
85	}
86	}

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