From 69406e8c4100c8994cfc8cd68e28dc7b9934ad82 Mon Sep 17 00:00:00 2001 From: Alberto Falossi <26248823+falox@users.noreply.github.com> Date: Mon, 23 Nov 2020 08:48:09 +0100 Subject: [PATCH] Refactor GetVersion() into a property --- src/libvirt/Connect.cs | 2 +- src/libvirt/Libvirt.cs | 16 +++++++++------- src/libvirt/libvirt.csproj | 2 +- tests/libvirt.Tests/LibraryTests.cs | 6 +++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/libvirt/Connect.cs b/src/libvirt/Connect.cs index fb052c5..e619b23 100644 --- a/src/libvirt/Connect.cs +++ b/src/libvirt/Connect.cs @@ -25,7 +25,7 @@ public void Open(bool readOnly = false) { if (IsDisposed) { - throw new ObjectDisposedException(null, "Cannot open a disposed Connect."); + throw new ObjectDisposedException("Connect", "Cannot open a disposed connection."); } if (readOnly) diff --git a/src/libvirt/Libvirt.cs b/src/libvirt/Libvirt.cs index 7be934d..2887560 100644 --- a/src/libvirt/Libvirt.cs +++ b/src/libvirt/Libvirt.cs @@ -34,16 +34,18 @@ private static IntPtr ImportResolver(string libraryName, Assembly assembly, DllI public const int VIR_UUID_BUFLEN = 36; - public static Version GetVersion() + public static Version Version { - LibvirtHelper.ThrowExceptionOnError(virGetVersion(out ulong libVer, null, out _)); - - int release = (int) (libVer % 1000); - int minor = (int) ((libVer % 1000000) / 1000); - int major = (int) (libVer / 1000000); + get + { + LibvirtHelper.ThrowExceptionOnError(virGetVersion(out ulong libVer, null, out _)); - return new Version(major, minor, release); + int release = (int) (libVer % 1000); + int minor = (int) ((libVer % 1000000) / 1000); + int major = (int) (libVer / 1000000); + return new Version(major, minor, release); + } } #region Library diff --git a/src/libvirt/libvirt.csproj b/src/libvirt/libvirt.csproj index 898bded..bc2598c 100644 --- a/src/libvirt/libvirt.csproj +++ b/src/libvirt/libvirt.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 libvirt-csharp - 0.0.1-alpha1 + 0.0.1-alpha2 true libvirt-csharp.snk diff --git a/tests/libvirt.Tests/LibraryTests.cs b/tests/libvirt.Tests/LibraryTests.cs index 938611e..3e1e944 100644 --- a/tests/libvirt.Tests/LibraryTests.cs +++ b/tests/libvirt.Tests/LibraryTests.cs @@ -7,7 +7,11 @@ public class LibraryTests [Fact] public void GetVersion_ReturnVersion() { - Libvirt.GetVersion(); + // Act + var version = Libvirt.Version; + + // Assert + Assert.True(version > new System.Version(0,0,1)); } } } \ No newline at end of file