Рефакторинг. Тесты.

src/Yandex.Music.Api.Tests/Tests/Models/ModelsTest.cs

@@ -0,0 +1,36 @@
+using FluentAssertions;
+
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Extensions.Ordering;
+
+using Yandex.Music.Api.Models.Account;
+using Yandex.Music.Api.Models.Common;
+using Yandex.Music.Api.Models.Track;
+using Yandex.Music.Api.Tests.Traits;
+
+namespace Yandex.Music.Api.Tests.Tests.API
+{
+    [Collection("Yandex Test Harness")]
+    [TestBeforeAfter]
+    public class ModelsTest : YandexTest
+    {
+        public ModelsTest(YandexTestHarness fixture, ITestOutputHelper output) : base(fixture, output)
+        {
+        }
+
+        [Fact]
+        [YandexTrait(TraitGroup.Models)]
+        public void YTrackAlbumPair_ValidData_True()
+        {
+            YTrackAlbumPair pair = new() {
+                Id = "1"
+            };
+
+            pair.ToString().Should().Be("1");
+
+            pair.AlbumId = "1";
+            pair.ToString().Should().Be("1:1");
+        }
+    }
+}

src/Yandex.Music.Api.Tests/Traits/TraitGroup.cs

@@ -2,7 +2,7 @@ namespace Yandex.Music.Api.Tests.Traits
 {
     public enum TraitGroup
     {
-        AccountAPI,
+        Models,
         AlbumAPI,
         ArtistAPI,
         LibraryAPI,

src/Yandex.Music.Api/Models/Track/YTrackAlbumPair.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Text;
+using System.Linq;
 
 namespace Yandex.Music.Api.Models.Track
 {
@@ -10,13 +10,7 @@ public class YTrackAlbumPair : IEquatable<YTrackAlbumPair>
 
         public override string ToString()
         {
-            var sb = new StringBuilder(Id);
-            if (string.IsNullOrWhiteSpace(AlbumId))
-                return sb.ToString();
-
-            sb.Append(':');
-            sb.Append(AlbumId);
-            return sb.ToString();
+            return string.Join(":", new[] { Id, AlbumId }.Where(s => !string.IsNullOrEmpty(s)));
         }
 
         #region IEquatable