fix: tests

src/Asv.Cfg.Test/ConfigurationBaseTest.cs

@@ -2,16 +2,19 @@
 using System.Linq;
 using System.Threading;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Asv.Cfg.Test;
 
 
 
-public abstract class ConfigurationBaseTest<T>
-    where T:IConfiguration
+public abstract class ConfigurationBaseTest<T>(ITestOutputHelper log)
+    where T : IConfiguration
 {
     protected abstract IDisposable CreateForTest(out T configuration);
-
+
+    public TestLoggerFactory LogFactory { get; set; } = new(log, TimeProvider.System, "Test");
+
     [Fact]
     public void Check_If_Saved_Setting_Exists()
     {
@@ -65,7 +68,8 @@ public void Check_Available_Parts_Value()
          Thread.Sleep(50);
 
          var expectedResult = new string[] { "test1", "test2", "test3", "test4" };
-         var actualResult = cfg.AvailableParts.OrderBy(x=>x).ToArray(); // items can be reordered in any way, so we need to sort them 
+         var exclude = cfg.ReservedParts.ToHashSet();
+         var actualResult = cfg.AvailableParts.OrderBy(x=>x).Where(x=>exclude.Contains(x) == false).ToArray(); // items can be reordered in any way, so we need to sort them 
 
          Assert.Equal(expectedResult, actualResult);
      }

src/Asv.Cfg.Test/InMemory/InMemoryConfigurationTest.cs

@@ -6,13 +6,12 @@
 namespace Asv.Cfg.Test
 {
     [TestSubject(typeof(InMemoryConfiguration))]
-    public class InMemoryConfigurationTest(ITestOutputHelper log) : ConfigurationBaseTest<InMemoryConfiguration>
+    public class InMemoryConfigurationTest(ITestOutputHelper log) : ConfigurationBaseTest<InMemoryConfiguration>(log)
     {
-        private readonly ITestOutputHelper _log = log;
 
         protected override IDisposable CreateForTest(out InMemoryConfiguration configuration)
         {
-            configuration = new InMemoryConfiguration(new TestLogger(_log,TimeProvider.System, "IM_MEMORY"));
+            configuration = new InMemoryConfiguration(LogFactory.CreateLogger("IM_MEMORY"));
             var cfg = configuration;
             return Disposable.Create(() => {cfg.Dispose(); });
         }

src/Asv.Cfg.Test/Json/JsonConfigurationTest.cs

@@ -58,7 +58,8 @@ public class TestMultiThreadClassFour
 
 
     [TestSubject(typeof(JsonConfiguration))]
-    public class JsonConfigurationTest(ITestOutputHelper log) : ConfigurationBaseTest<JsonConfiguration>
+    public class JsonConfigurationTest(ITestOutputHelper log) 
+        : ConfigurationBaseTest<JsonConfiguration>(log)
     {
         private readonly IFileSystem _fileSystem = new MockFileSystem();
 
@@ -75,8 +76,7 @@ protected override IDisposable CreateForTest(out JsonConfiguration configuration
                 _fileSystem.Directory.Delete(workingDir);
             }
 
-            log.WriteLine($"Working directory: {workingDir}");
-            configuration = new JsonConfiguration(workingDir, logger:new TestLogger(log,TimeProvider.System, "JSON"),  fileSystem: _fileSystem);
+            configuration = new JsonConfiguration(workingDir, logger:LogFactory.CreateLogger("JSON_CONFIG"),  fileSystem: _fileSystem);
             var cfg = configuration;
             return Disposable.Create(() =>
             {

src/Asv.Cfg.Test/Json/JsonOneFileConfigurationTest.cs

@@ -13,7 +13,8 @@
 namespace Asv.Cfg.Test
 {
     [TestSubject(typeof(JsonOneFileConfiguration))]
-    public class JsonOneFileConfigurationTest(ITestOutputHelper log) : ConfigurationBaseTest<JsonOneFileConfiguration>
+    public class JsonOneFileConfigurationTest(ITestOutputHelper log) 
+        : ConfigurationBaseTest<JsonOneFileConfiguration>(log)
     {
         private readonly IFileSystem _fileSystem = new MockFileSystem();
 
@@ -24,7 +25,7 @@ protected override IDisposable CreateForTest(out JsonOneFileConfiguration config
                 filePath,
                 true,
                 null,
-                logger:new TestLogger(log,TimeProvider.System, "JSON_ONE_FILE"),
+                logger:LogFactory.CreateLogger("JSON_ONE_FILE"),
                 fileSystem: _fileSystem
             );
 

src/Asv.Cfg.Test/Json/ZipJsonConfigurationTest.cs

@@ -11,7 +11,7 @@ namespace Asv.Cfg.Test
 {
     [TestSubject(typeof(ZipJsonConfiguration))]
     public class ZipJsonConfigurationTest(ITestOutputHelper log)
-        : ConfigurationBaseTest<ZipJsonConfiguration>
+        : ConfigurationBaseTest<ZipJsonConfiguration>(log)
     {
         private readonly IFileSystem _fileSystem = new MockFileSystem();
 
@@ -33,7 +33,7 @@ protected override IDisposable CreateForTest(out ZipJsonConfiguration configurat
                 _fileSystem.Directory.CreateDirectory(dir ?? throw new InvalidOperationException());
             }
             var file = _fileSystem.File.Open(filePath, FileMode.OpenOrCreate);
-            configuration = new ZipJsonConfiguration(file, true, new TestLogger(log,TimeProvider.System, "ZIP_JSON"));
+            configuration = new ZipJsonConfiguration(file, true, logger:LogFactory.CreateLogger("ZIP_JSON"));
             var cfg = configuration;
             return Disposable.Create(() =>
             {

src/Asv.Cfg.Test/Json/ZipJsonVersionedFileTest.cs

@@ -1,15 +1,20 @@
 using System;
+using System.IO;
+using Asv.Common;
 using JetBrains.Annotations;
+using R3;
+using Xunit.Abstractions;
 
 namespace Asv.Cfg.Test;
 
 [TestSubject(typeof(ZipJsonVersionedFile))]
-public class ZipJsonVersionedFileTest:ConfigurationBaseTest<ZipJsonVersionedFile>
+public class ZipJsonVersionedFileTest(ITestOutputHelper log):ConfigurationBaseTest<ZipJsonVersionedFile>(log)
 {
 
 
     protected override IDisposable CreateForTest(out ZipJsonVersionedFile configuration)
     {
-        throw new NotImplementedException();        
+        configuration = new ZipJsonVersionedFile(new MemoryStream(), new SemVersion(1,0),"test",true, false, LogFactory.CreateLogger("ZIP_VERSION_JSON_CONFIG"));
+        return Disposable.Empty;        
     }
 }

src/Asv.Cfg/IConfiguration.cs

@@ -62,6 +62,7 @@ public static void Remove<TPocoType>(this IConfiguration src)
 
     public interface IConfiguration:IDisposable
     {
+        IEnumerable<string> ReservedParts { get; }
         IEnumerable<string> AvailableParts { get; }
         bool Exist(string key);
         TPocoType Get<TPocoType>(string key, Lazy<TPocoType> defaultValue);

src/Asv.Cfg/InMemory/InMemoryConfiguration.cs

@@ -27,6 +27,7 @@ public void Dispose()
             _onError.Dispose();
         }
 
+        public IEnumerable<string> ReservedParts => Array.Empty<string>();
         public IEnumerable<string> AvailableParts => GetParts();
 
         private IEnumerable<string> GetParts()

src/Asv.Cfg/Json/JsonConfiguration.cs

@@ -46,7 +46,9 @@ private string GetFilePath(string key)
         {
             return _fileSystem.Path.Combine(_folderPath, $"{key}.json");
         }
-
+
+        public IEnumerable<string> ReservedParts => Array.Empty<string>();
+
         public IEnumerable<string> AvailableParts
         {
             get

src/Asv.Cfg/Json/JsonOneFileConfiguration.cs

@@ -142,6 +142,7 @@ private void InternalSaveChanges(Unit unit)
             }
         }
 
+        public IEnumerable<string> ReservedParts => Array.Empty<string>();
         public IEnumerable<string> AvailableParts => _values.Keys;
 
         public bool Exist(string key)

src/Asv.Cfg/Json/ZipJsonConfiguration.cs

@@ -67,6 +67,7 @@ public IEnumerable<string> AvailableParts
             }
         }
 
+        public virtual IEnumerable<string> ReservedParts => Array.Empty<string>();
 
         public bool Exist(string key)
         {

src/Asv.Cfg/Json/ZipJsonVersionedFile.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Asv.Common;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Asv.Cfg
@@ -43,11 +45,19 @@ public interface IVersionedFile:IConfiguration
         SemVersion FileVersion { get; }
     }
 
-    public abstract class ZipJsonVersionedFile: ZipJsonConfiguration,IVersionedFile
+    public class ZipJsonVersionedFile: ZipJsonConfiguration,IVersionedFile
     {
         private readonly SemVersion _version;
         private const string InfoKey = "FileInfo";
-        protected ZipJsonVersionedFile(Stream zipStream,SemVersion lastVersion, string fileType, bool createIfNotExist):base(zipStream)
+
+        public ZipJsonVersionedFile(
+            Stream zipStream,
+            SemVersion lastVersion, 
+            string fileType, 
+            bool createIfNotExist,
+            bool leaveOpen = false, 
+            ILogger? logger = null )
+            :base(zipStream, leaveOpen,logger)
         {
             var info = Get(InfoKey, new Lazy<ZipJsonFileInfo>(ZipJsonFileInfo.Empty));
             string type;
@@ -82,7 +92,8 @@ protected ZipJsonVersionedFile(Stream zipStream,SemVersion lastVersion, string f
                 throw new Exception($"Unsupported file type. (Want '{fileType}', got '{type}')");
             }
         }
-
+
+        public override IEnumerable<string> ReservedParts => [InfoKey];
         public SemVersion FileVersion => _version;
     }
 }

src/Asv.IO.Test/Streams/TelnetStreamTest.cs

@@ -17,7 +17,7 @@ public TelnetStreamTest(ITestOutputHelper output)
         {
             _output = output;
         }
-        [Fact]
+        [Fact(Skip = "Manual test")]
         public async Task ReadWriteMessageTest()
         {
             var message1 = "Ping";