Debugged and fixed several failing tests.

Author: DualBrain

Community.VisualBasic.Tests/Community/VisualBasic/FileIO/FileSystemTests.vb

@@ -717,15 +717,14 @@ Namespace Global.Community.VisualBasic.FileIO.Tests
 
     <Fact>
     Public Sub MoveFile_SourceFileName_DestinationFileName_OverwriteTrue()
-      Dim SourceFileNameWithPath As String = CreateTestFile(SourceData, TestFileName:=GetTestFileName())
-      Dim DestinationFileNameWithPath As String = IO.Path.Combine(TestDirectory, "NewName")
+      Dim SourceFileNameWithPath = CreateTestFile(SourceData, TestFileName:=GetTestFileName())
+      Dim DestinationFileNameWithPath = IO.Path.Combine(TestDirectory, "NewName")
       FileIO.FileSystem.MoveFile(SourceFileNameWithPath, DestinationFileNameWithPath, overwrite:=True)
       Assert.[False](IO.File.Exists(SourceFileNameWithPath))
       Assert.[True](IO.File.Exists(DestinationFileNameWithPath))
       Assert.[True](HasExpectedData(DestinationFileNameWithPath, SourceData))
-      ' TODO: Check, VB does not directly support MemberAccess off a Conditional If Expression
-      Dim tempVar1 = New IO.FileInfo(SourceFileNameWithPath)
-      CreateTestFile(DestData, PathFromBase:=Nothing, TestFileName:=tempVar1.Name)
+      'CreateTestFile(DestData, PathFromBase: null, TestFileName: (new System.IO.FileInfo(SourceFileNameWithPath)).Name);
+      CreateTestFile(DestData, (New IO.FileInfo(SourceFileNameWithPath)).Name, Nothing)
       FileIO.FileSystem.MoveFile(sourceFileName:=DestinationFileNameWithPath, destinationFileName:=SourceFileNameWithPath, overwrite:=True)
       Assert.[True](IO.File.Exists(SourceFileNameWithPath))
       Assert.[False](IO.File.Exists(DestinationFileNameWithPath))

Community.VisualBasic.Tests/CompilerServices/VersionedTests.vb

@@ -19,7 +19,7 @@ Namespace Global.Community.VisualBasic.Tests
     Public Sub CallByName(instance As Object, methodName As String, useCallType As CallType, args As Object(), getResult As Func(Of Object, Object), expected As Object)
       Assert.Equal(If(getResult Is Nothing, expected, Nothing), Versioned.CallByName(instance, methodName, useCallType, args))
       If getResult IsNot Nothing Then
-        Assert.Equal(expected, getResult(instance)())
+        Assert.Equal(expected, getResult(instance))
       End If
     End Sub
 

Community.VisualBasic.Tests/LateBindingTests.vb

@@ -17,7 +17,7 @@ Namespace Global.Community.VisualBasic.CompilerServices.Tests
     <MemberData(NameOf(LateCall_TestData))>
     Public Sub LateCall(obj As Object, objType As Type, name As String, args As Object(), paramNames As String(), copyBack As Boolean(), getResult As Func(Of Object, Object), expected As Object)
       LateBinding.LateCall(obj, objType, name, args, paramNames, copyBack)
-      Assert.Equal(expected, getResult(obj)())
+      Assert.Equal(expected, getResult(obj))
     End Sub
 
     <Theory>
@@ -30,7 +30,7 @@ Namespace Global.Community.VisualBasic.CompilerServices.Tests
     <MemberData(NameOf(LateSet_TestData))>
     Public Sub LateSet(obj As Object, objType As Type, name As String, args As Object(), paramNames As String(), getResult As Func(Of Object, Object), expected As Object)
       LateBinding.LateSet(obj, objType, name, args, paramNames)
-      Assert.Equal(expected, getResult(obj)())
+      Assert.Equal(expected, getResult(obj))
     End Sub
 
     <Theory>
@@ -64,7 +64,7 @@ Namespace Global.Community.VisualBasic.CompilerServices.Tests
     <MemberData(NameOf(LateIndexSet_TestData))>
     Public Sub LateIndexSet(obj As Object, args As Object(), paramNames As String(), getResult As Func(Of Object, Object), expected As Object)
       LateBinding.LateIndexSet(obj, args, paramNames)
-      Assert.Equal(expected, getResult(obj)())
+      Assert.Equal(expected, getResult(obj))
     End Sub
 
     <Theory>
@@ -238,14 +238,23 @@ Namespace Global.Community.VisualBasic.CompilerServices.Tests
 
     Private Structure InstanceStruct
 
-      Public Value As Integer
+      Private m_value As Integer
+
+      Public Property Value As Integer
+        Get
+          Return m_value
+        End Get
+        Set(value1 As Integer)
+          m_value = value1
+        End Set
+      End Property
 
       Public Property P As Integer
         Get
           Return Value
         End Get
-        Set(value As Integer)
-          Me.Value = value
+        Set(value1 As Integer)
+          Value = value1
         End Set
       End Property
 
@@ -269,8 +278,8 @@ Namespace Global.Community.VisualBasic.CompilerServices.Tests
         Get
           Return CInt(Fix(x)) + CInt(Fix(y))
         End Get
-        Set(Value As Integer)
-          Me.Value = CInt(Fix(x)) + CInt(Fix(y)) + Value
+        Set(value1 As Integer)
+          Value = CInt(Fix(x)) + CInt(Fix(y)) + value1
         End Set
       End Property
 

Community.VisualBasic/Community.VisualBasic/CompilerServices/LateBinding.vb

@@ -680,28 +680,34 @@ UseCallType As CallType)
     End Function
 
     <DebuggerHiddenAttribute(), DebuggerStepThroughAttribute()>
-    Public Shared Sub LateIndexSetComplex(o As Object, args() As Object, paramnames() As String,
-OptimisticSet As Boolean, RValueBase As Boolean)
+    Public Shared Sub LateIndexSetComplex(o As Object,
+                                          args() As Object,
+                                          paramnames() As String,
+                                          OptimisticSet As Boolean,
+                                          RValueBase As Boolean)
 
       Try
+
         LateIndexSet(o, args, paramnames)
 
         If RValueBase AndAlso o.GetType().IsValueType Then
           Throw New Exception(SR.Format(SR.RValueBaseForValueType, o.GetType().Name, o.GetType().Name))
         End If
+
       Catch ex As System.MissingMemberException When OptimisticSet = True
         'A missing member exception means it has no Set member.  Silently handle the exception.
       End Try
+
     End Sub
 
-    <DebuggerHiddenAttribute(), DebuggerStepThroughAttribute()>
+    '<DebuggerHiddenAttribute(), DebuggerStepThroughAttribute()>
     Public Shared Sub LateIndexSet(o As Object, args() As Object, paramnames() As String)
 
       Dim objType As Type
       Dim DefaultName As String = Nothing
 
       If o Is Nothing Then
-        Throw VbMakeException(vbErrors.ObjNotSet)
+        Throw VbMakeException(VbErrors.ObjNotSet)
       End If
 
       objType = o.GetType()
@@ -726,13 +732,15 @@ OptimisticSet As Boolean, RValueBase As Boolean)
 
         NewValue = args(ArgCount)
         If NewValue IsNot Nothing Then
+
           Dim elemType As Type
           elemType = objType.GetElementType()
 
           'Check that the type is valid for the assignment
           If NewValue.GetType() IsNot elemType Then
             NewValue = ObjectType.CTypeHelper(NewValue, elemType)
           End If
+
         End If
 
         'Check for valid dimensions
@@ -747,17 +755,21 @@ OptimisticSet As Boolean, RValueBase As Boolean)
           ary.SetValue(NewValue, CInt(args(0)), CInt(args(1)))
 
         Else
+
           Dim IndexArray() As Integer
           Dim ArgIndex As Integer
           ReDim IndexArray(ArgCount - 1)
 
           For ArgIndex = 0 To ArgCount - 1
             IndexArray(ArgIndex) = CInt(args(ArgIndex))
-          Next ArgIndex
+          Next
 
           ary.SetValue(NewValue, IndexArray)
+
         End If
+
       Else
+
         Dim flags As BindingFlags
         Dim member As MemberInfo
         Dim members As MemberInfo()
@@ -771,10 +783,12 @@ OptimisticSet As Boolean, RValueBase As Boolean)
                 BindingFlags.Public
 
         If objType.IsCOMObject() Then
+
           CheckForClassExtendingCOMClass(objType)
           flags = flags Or GetPropertyPutFlags(args(args.GetUpperBound(0)))
 
         Else
+
           flags = flags Or BindingFlags.SetProperty
           If (args.Length = 1) Then
             flags = flags Or BindingFlags.SetField
@@ -816,15 +830,18 @@ OptimisticSet As Boolean, RValueBase As Boolean)
               ' report a bug to the CLR.
               Debug.Assert(False)
             End Try
-          Next i
+          Next
+
         End If
 
         Dim binder As VBBinder
         binder = New VBBinder(Nothing)
         Try
+
           If objType.IsCOMObject Then
             binder.InvokeMember("", flags, objType, objIReflect, o, args, paramnames)
           Else
+
             Dim state As Object = Nothing
             Dim method As MethodBase
 
@@ -857,13 +874,16 @@ OptimisticSet As Boolean, RValueBase As Boolean)
           End If
 
         Catch ex As Exception When IsMissingMemberException(ex)
+
           'Override the message so that we're consistent with above Throw
           Throw New MissingMemberException(SR.Format(SR.MissingMember_NoDefaultMemberFound1, VBFriendlyName(objType, o)))
 
         Catch ex As TargetInvocationException
           Throw ex.InnerException
         End Try
+
       End If
+
     End Sub
 
     Private Shared Function GetPropertyPutFlags(NewValue As Object) As BindingFlags

Community.VisualBasic/Community.VisualBasic/CompilerServices/NewLateBinding.vb

@@ -18,20 +18,20 @@ Namespace Global.Community.VisualBasic.CompilerServices
   ' Implements VB late binder.
   <ComponentModel.EditorBrowsable(ComponentModel.EditorBrowsableState.Never)>
   Public NotInheritable Class NewLateBinding
+
     ' Prevent creation.
     Private Sub New()
     End Sub
 
     <DebuggerHiddenAttribute()> <DebuggerStepThroughAttribute()>
-    Public Shared Function LateCall(
-Instance As Object,
-Type As System.Type,
-MemberName As String,
-Arguments As Object(),
-ArgumentNames As String(),
-TypeArguments As System.Type(),
-CopyBack As Boolean(),
-IgnoreReturn As Boolean) As Object
+    Public Shared Function LateCall(Instance As Object,
+                                    Type As System.Type,
+                                    MemberName As String,
+                                    Arguments As Object(),
+                                    ArgumentNames As String(),
+                                    TypeArguments As System.Type(),
+                                    CopyBack As Boolean(),
+                                    IgnoreReturn As Boolean) As Object
 
       If Arguments Is Nothing Then Arguments = NoArguments
       If ArgumentNames Is Nothing Then ArgumentNames = NoArgumentNames
@@ -57,27 +57,25 @@ IgnoreReturn As Boolean) As Object
     <Obsolete("do not use this method", True)>
     <System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)>
     <DebuggerHiddenAttribute()> <DebuggerStepThroughAttribute()>
-    Public Shared Function FallbackCall(
-Instance As Object,
-MemberName As String,
-Arguments As Object(),
-ArgumentNames As String(),
-IgnoreReturn As Boolean) As Object
+    Public Shared Function FallbackCall(Instance As Object,
+                                        MemberName As String,
+                                        Arguments As Object(),
+                                        ArgumentNames As String(),
+                                        IgnoreReturn As Boolean) As Object
+
+      Return ObjectLateCall(Instance, Nothing, MemberName, Arguments, ArgumentNames, NoTypeArguments, IDOBinder.GetCopyBack(), IgnoreReturn)
 
-      Return ObjectLateCall(Instance, Nothing, MemberName, Arguments,
-          ArgumentNames, NoTypeArguments, IDOBinder.GetCopyBack(), IgnoreReturn)
     End Function
 
     <DebuggerHiddenAttribute()> <DebuggerStepThroughAttribute()>
-    Private Shared Function ObjectLateCall(
-instance As Object,
-type As System.Type,
-memberName As String,
-arguments As Object(),
-argumentNames As String(),
-typeArguments As System.Type(),
-copyBack As Boolean(),
-ignoreReturn As Boolean) As Object
+    Private Shared Function ObjectLateCall(instance As Object,
+                                           type As System.Type,
+                                           memberName As String,
+                                           arguments As Object(),
+                                           argumentNames As String(),
+                                           typeArguments As System.Type(),
+                                           copyBack As Boolean(),
+                                           ignoreReturn As Boolean) As Object
 
       Dim baseReference As Container
       If type IsNot Nothing Then
@@ -91,20 +89,21 @@ ignoreReturn As Boolean) As Object
 
       Dim failure As ResolutionFailure
 
-      Return CallMethod(
-                 baseReference,
-                 memberName,
-                 arguments,
-                 argumentNames,
-                 typeArguments,
-                 copyBack,
-                 invocationFlags,
-                 True,
-                 failure)
+      Return CallMethod(baseReference,
+                        memberName,
+                        arguments,
+                        argumentNames,
+                        typeArguments,
+                        copyBack,
+                        invocationFlags,
+                        True,
+                        failure)
+
     End Function
 
     'Quick check to determine if FallbackCall will succeed
     Friend Shared Function CanBindCall(instance As Object, memberName As String, arguments As Object(), argumentNames As String(), ignoreReturn As Boolean) As Boolean
+
       Dim baseReference As New Container(instance)
       Dim invocationFlags As BindingFlags = BindingFlagsInvokeMethod Or BindingFlagsGetProperty
       If ignoreReturn Then invocationFlags = invocationFlags Or BindingFlagsIgnoreReturn
@@ -128,6 +127,7 @@ ignoreReturn As Boolean) As Object
               failure)
 
       Return failure = ResolutionFailure.None
+
     End Function
 
     ' LateCallInvokeDefault is used to optionally invoke the default action on a call target.
@@ -799,17 +799,15 @@ RValueBase As Boolean)
     <Obsolete("do not use this method", True)>
     <System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)>
     <DebuggerHiddenAttribute(), DebuggerStepThroughAttribute()>
-    Public Shared Sub FallbackSetComplex(
-Instance As Object,
-MemberName As String,
-Arguments() As Object,
-OptimisticSet As Boolean,
-RValueBase As Boolean)
+    Public Shared Sub FallbackSetComplex(Instance As Object,
+                                         MemberName As String,
+                                         Arguments() As Object,
+                                         OptimisticSet As Boolean,
+                                         RValueBase As Boolean)
 
-      ObjectLateSetComplex(
-          Instance, Nothing, MemberName, Arguments, Array.Empty(Of String)(),
-          NoTypeArguments, OptimisticSet, RValueBase)
-    End Sub 'FallbackSetComplex
+      ObjectLateSetComplex(Instance, Nothing, MemberName, Arguments, Array.Empty(Of String)(), NoTypeArguments, OptimisticSet, RValueBase)
+
+    End Sub
 
     <DebuggerHiddenAttribute(), DebuggerStepThroughAttribute()>
     Friend Shared Sub ObjectLateSetComplex(

Community.VisualBasic/Community.VisualBasic/CompilerServices/Utils.LateBinder.vb

@@ -57,7 +57,7 @@ Namespace Global.Community.VisualBasic.CompilerServices
       Return name
     End Function
 
-    Friend Shared Function GetResourceString(ResourceId As vbErrors) As String
+    Friend Shared Function GetResourceString(ResourceId As VbErrors) As String
       Dim id As String = "ID" & CStr(ResourceId)
       Return SR.GetResourceString(id, id)
     End Function
@@ -348,15 +348,17 @@ GetSpecialValue:
     End Function
 
     Friend Shared Function VBFriendlyName(typ As System.Type, o As Object) As String
+
       If typ.IsCOMObject AndAlso (typ.FullName = "System.__ComObject") Then
-#If WINDOWS Then
-        Return TypeNameOfCOMObject(o, False)
-#Else
-        Throw New PlatformNotSupportedException
-#End If
+        If OperatingSystem.IsWindows Then
+          Return TypeNameOfCOMObject(o, False)
+        Else
+          Throw New PlatformNotSupportedException
+        End If
       End If
 
       Return VBFriendlyNameOfType(typ)
+
     End Function
 
     Friend Shared Function VBFriendlyNameOfType(typ As System.Type, Optional fullName As Boolean = False) As String