Symbols API

Directory.Build.props

@@ -7,6 +7,10 @@
         <SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedImageRuntimes>
         <EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
 
+        <EnabledRuntimes>win-x64;win-x86</EnabledRuntimes>
+        <EnabledToolRuntimes>win-x64;win-x86</EnabledToolRuntimes>
+        <EnabledImageRuntimes>win-x64;win-x86</EnabledImageRuntimes>
+
         <_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
         <_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
         <_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>

IKVM.deps.targets

@@ -15,6 +15,7 @@
                 <Reference Include="System.Security" />
                 <PackageReference Include="System.Buffers" Version="4.5.1" />
                 <PackageReference Include="System.Memory" Version="4.5.5"  />
+                <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
                 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
                 <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
                 <PackageReference Include="System.ValueTuple" Version="4.5.0" />

src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj

@@ -6,13 +6,14 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net481;net6.0;net8.0</TargetFrameworks>
-        <LangVersion>11</LangVersion>
         <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\IKVM.Java.Extensions\IKVM.Java.Extensions.csproj" />
         <ProjectReference Include="..\IKVM.Image\IKVM.Image.csproj" />
+        <ProjectReference Include="..\IKVM.JTReg.TestAdapter.Core\IKVM.JTReg.TestAdapter.Core.csproj" />
+        <ProjectReference Include="..\IKVM.JTReg.TestAdapter\IKVM.JTReg.TestAdapter.csproj" />
     </ItemGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />

src/IKVM.ConsoleApp/Program.cs

@@ -1,27 +1,36 @@
-using System;
-using System.Diagnostics.Tracing;
+using System.Threading;
+
+using IKVM.JTReg.TestAdapter.Core;
 
 namespace IKVM.ConsoleApp
 {
 
     public class Program
     {
 
-        public static void Main(string[] args)
+        class MyDiscoverycontext : IJTRegDiscoveryContext
         {
-            var l = new Listener();
-            var o = new java.lang.Object();
-            java.lang.System.loadLibrary("hi");
-        }
 
-    }
+            public JTRegTestOptions Options => new JTRegTestOptions()
+            {
 
-    class Listener : EventListener
-    {
+            };
+
+            public void SendMessage(JTRegTestMessageLevel level, string message)
+            {
 
-        protected override void OnEventWritten(EventWrittenEventArgs eventData)
+            }
+
+            public void SendTestCase(JTRegTestCase testCase)
+            {
+
+            }
+
+        }
+
+        public static void Main(string[] args)
         {
-            Console.WriteLine(eventData);
+            JTRegTestManager.Instance.DiscoverTests(@"D:\ikvm\src\IKVM.JTReg.TestAdapter.Tests\bin\Debug\net478\IKVM.JTReg.TestAdapter.Tests.dll", new MyDiscoverycontext(), CancellationToken.None);
         }
 
     }

src/IKVM.CoreLib.Tests/Collections/IndexRangeDictionaryTests.cs

@@ -0,0 +1,116 @@
+using FluentAssertions;
+
+using IKVM.CoreLib.Collections;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace IKVM.CoreLib.Tests.Collections
+{
+
+    [TestClass]
+    public class IndexRangeDictionaryTests
+    {
+
+        [TestMethod]
+        public void AlignTowardsInfinity()
+        {
+            IndexRangeDictionary<string>.AlignTowardsInfinity(0).Should().Be(0);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(1).Should().Be(8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(7).Should().Be(8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(8).Should().Be(8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(9).Should().Be(16);
+
+            IndexRangeDictionary<string>.AlignTowardsInfinity(-0).Should().Be(-0);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(-1).Should().Be(-8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(-7).Should().Be(-8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(-8).Should().Be(-8);
+            IndexRangeDictionary<string>.AlignTowardsInfinity(-9).Should().Be(-16);
+        }
+
+        [TestMethod]
+        public void AlignTowardsZero()
+        {
+            IndexRangeDictionary<string>.AlignTowardsZero(0).Should().Be(0);
+            IndexRangeDictionary<string>.AlignTowardsZero(1).Should().Be(0);
+            IndexRangeDictionary<string>.AlignTowardsZero(7).Should().Be(0);
+            IndexRangeDictionary<string>.AlignTowardsZero(8).Should().Be(8);
+            IndexRangeDictionary<string>.AlignTowardsZero(9).Should().Be(8);
+
+            IndexRangeDictionary<string>.AlignTowardsZero(-0).Should().Be(-0);
+            IndexRangeDictionary<string>.AlignTowardsZero(-1).Should().Be(-0);
+            IndexRangeDictionary<string>.AlignTowardsZero(-7).Should().Be(-0);
+            IndexRangeDictionary<string>.AlignTowardsZero(-8).Should().Be(-8);
+            IndexRangeDictionary<string>.AlignTowardsZero(-9).Should().Be(-8);
+        }
+
+        [TestMethod]
+        public void CanAddBasicItem()
+        {
+            var d = new IndexRangeDictionary<string>();
+            d[0] = "Item1";
+            d[0].Should().Be("Item1");
+            d._minKey.Should().Be(0);
+            d._maxKey.Should().Be(0);
+            d._items.Length.Should().Be(8);
+        }
+
+        [TestMethod]
+        public void CanAddOffsetItem()
+        {
+            var d = new IndexRangeDictionary<string>();
+            d[10] = "Item1";
+            d[10].Should().Be("Item1");
+            d._minKey.Should().Be(8);
+            d._maxKey.Should().Be(16);
+            d._items.Length.Should().Be(16);
+        }
+
+        [TestMethod]
+        public void CanAddSparseRange()
+        {
+            var d = new IndexRangeDictionary<string>();
+            d[10] = "Item1";
+            d[10].Should().Be("Item1");
+            d._minKey.Should().Be(8);
+            d._maxKey.Should().Be(16);
+            d._items.Length.Should().Be(16);
+            d[20] = "Item2";
+            d[10].Should().Be("Item1");
+            d[20].Should().Be("Item2");
+            d._minKey.Should().Be(8);
+            d._maxKey.Should().Be(24);
+            d._items.Length.Should().Be(32);
+            d[5].Should().BeNull();
+            d[10].Should().Be("Item1");
+            d[15].Should().BeNull();
+            d[19].Should().BeNull();
+            d[20].Should().Be("Item2");
+            d[21].Should().BeNull();
+        }
+
+        [TestMethod]
+        public void CanAddMaxBeforeMin()
+        {
+            var d = new IndexRangeDictionary<string>();
+            d[20] = "Item1";
+            d[20].Should().Be("Item1");
+            d[10] = "Item2";
+            d[10].Should().Be("Item2");
+            d[20] = "Item1";
+            d[20].Should().Be("Item1");
+        }
+
+        [TestMethod]
+        public void ShiftShouldBeEmpty()
+        {
+            var d = new IndexRangeDictionary<string>();
+            d[2] = "Item2";
+            d[2].Should().Be("Item2");
+            d[0] = "Item0";
+            d[0].Should().Be("Item0");
+            d[1].Should().BeNull();
+        }
+
+    }
+
+}