Support for MI_DatetimeA marshalling

John Kordich · John Kordich · commit f8af18f205f6 · 2016-06-28T13:09:01.000-07:00
diff --git a/src/Microsoft.Management.Infrastructure/CimProperty.cs b/src/Microsoft.Management.Infrastructure/CimProperty.cs
@@ -361,10 +361,37 @@ internal static MI_Value ConvertToNativeLayer(object value, CimType cimType)
                         {
                             array[i] = MI_Datetime.ConvertToDateTime(arrayOfObjects[i]);
                         }
+
                         miv.DatetimeA = array;
                         return miv;
                     }
-                    break;
+
+                    var arrayOfDateTime = value as DateTime[];
+                    if (arrayOfDateTime != null)
+                    {
+                        MI_Datetime[] array = new MI_Datetime[arrayOfDateTime.Length];
+                        for (int i = 0; i < arrayOfDateTime.Length; i++)
+                        {
+                            array[i] = MI_Datetime.ConvertToDateTime(arrayOfDateTime[i]);
+                        }
+
+                        miv.DatetimeA = array;
+                        return miv;
+                    }
+
+                    var arrayOfTimeSpan = value as TimeSpan[];
+                    if (arrayOfTimeSpan != null)
+                    {
+                        MI_Datetime[] array = new MI_Datetime[arrayOfTimeSpan.Length];
+                        for (int i = 0; i < arrayOfTimeSpan.Length; i++)
+                        {
+                            array[i] = MI_Datetime.ConvertToDateTime(arrayOfTimeSpan[i]);
+                        }
+
+                        miv.DatetimeA = array;
+                        return miv;
+                    }
+                    return miv;
 
                 case CimType.Unknown:
                     miv.String = "UnknownType";
diff --git a/src/Microsoft.Management.Infrastructure/Internal/ValueHelpers.cs b/src/Microsoft.Management.Infrastructure/Internal/ValueHelpers.cs
@@ -32,8 +32,7 @@ internal static void ThrowIfMismatchedType(MI_Type type, object managedValue)
         internal static object CloneManagedObject(object managedValue, CimType type)
         {
             if (managedValue != null &&
-                ((type.FromCimType() & MI_TypeFlags.MI_ARRAY) == MI_TypeFlags.MI_ARRAY ||
-                type == CimType.Reference || type == CimType.Instance))
+                (type == CimType.Reference || type == CimType.Instance))
             {
                 throw new NotImplementedException();
             }
@@ -140,11 +139,17 @@ internal static object ConvertFromNativeLayer(
             }
             else if (type == MI_Type.MI_DATETIME)
             {
-                return value.Datetime.ConvertToNativeLayer();
+                return value.Datetime.ConvertFromNativeLayer();
             }
             else if (type == MI_Type.MI_DATETIMEA)
             {
-                throw new NotImplementedException();
+                int length = value.DatetimeA.Length;
+                object[] arrayOfDatetimes = new object[length];
+                for (int i = 0; i < length; i++)
+                {
+                    arrayOfDatetimes[i] = value.DatetimeA[i].ConvertFromNativeLayer();
+                }
+                return arrayOfDatetimes;
             }
             else
             {
diff --git a/src/Microsoft.Management.Infrastructure/Native/Structures/MI_Datetime.cs b/src/Microsoft.Management.Infrastructure/Native/Structures/MI_Datetime.cs
@@ -33,7 +33,7 @@ internal static MI_Datetime ConvertToDateTime(object value)
             }
         }
 
-        internal object ConvertToNativeLayer()
+        internal object ConvertFromNativeLayer()
         {
             if (this.isTimestamp)
             {
diff --git a/test/Microsoft.Management.Infrastructure.Tests/UnitTests/CimInstanceTest.cs b/test/Microsoft.Management.Infrastructure.Tests/UnitTests/CimInstanceTest.cs
@@ -943,7 +943,7 @@ public void Properties_Add_ValueAndType_Char16Array()
             Assert.Equal(CimType.Char16Array, addedProperty.CimType, "addedProperty.CimType is  not correct");
         }
 
-        [TDDFact]
+        [Fact]
         public void Properties_Add_ValueAndType_DateTimeArray_DateTime()
         {
             DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);
@@ -964,7 +964,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_DateTime()
             Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");
         }
 
-        [TDDFact]
+        [Fact]
         public void Properties_Add_ValueAndType_DateTimeArray_TimeSpan()
         {
             TimeSpan myInterval1 = TimeSpan.FromSeconds(123);
@@ -985,7 +985,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_TimeSpan()
             Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");
         }
 
-        [TDDFact]
+        [Fact]
         public void Properties_Add_ValueAndType_DateTimeArray_Mixed()
         {
             DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);
@@ -1006,7 +1006,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_Mixed()
             Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");
         }
 
-        [TDDFact]
+        [Fact]
         public void Properties_Add_ValueAndType_DateTimeArray_Mixed_InferredType()
         {
             DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ internal static void ThrowIfMismatchedType(MI_Type type, object managedValue)`
`32`	`32`	`internal static object CloneManagedObject(object managedValue, CimType type)`
`33`	`33`	`{`
`34`	`34`	`if (managedValue != null &&`
`35`		`- ((type.FromCimType() & MI_TypeFlags.MI_ARRAY) == MI_TypeFlags.MI_ARRAY \|\|`
`36`		`- type == CimType.Reference \|\| type == CimType.Instance))`
	`35`	`+ (type == CimType.Reference \|\| type == CimType.Instance))`
`37`	`36`	`{`
`38`	`37`	`throw new NotImplementedException();`
`39`	`38`	`}`
`@@ -140,11 +139,17 @@ internal static object ConvertFromNativeLayer(`
`140`	`139`	`}`
`141`	`140`	`else if (type == MI_Type.MI_DATETIME)`
`142`	`141`	`{`
`143`		`- return value.Datetime.ConvertToNativeLayer();`
	`142`	`+ return value.Datetime.ConvertFromNativeLayer();`
`144`	`143`	`}`
`145`	`144`	`else if (type == MI_Type.MI_DATETIMEA)`
`146`	`145`	`{`
`147`		`- throw new NotImplementedException();`
	`146`	`+ int length = value.DatetimeA.Length;`
	`147`	`+ object[] arrayOfDatetimes = new object[length];`
	`148`	`+ for (int i = 0; i < length; i++)`
	`149`	`+ {`
	`150`	`+ arrayOfDatetimes[i] = value.DatetimeA[i].ConvertFromNativeLayer();`
	`151`	`+ }`
	`152`	`+ return arrayOfDatetimes;`
`148`	`153`	`}`
`149`	`154`	`else`
`150`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ internal static MI_Datetime ConvertToDateTime(object value)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- internal object ConvertToNativeLayer()`
	`36`	`+ internal object ConvertFromNativeLayer()`
`37`	`37`	`{`
`38`	`38`	`if (this.isTimestamp)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ public void Properties_Add_ValueAndType_Char16Array()`
`943`	`943`	`Assert.Equal(CimType.Char16Array, addedProperty.CimType, "addedProperty.CimType is not correct");`
`944`	`944`	`}`
`945`	`945`
`946`		`- [TDDFact]`
	`946`	`+ [Fact]`
`947`	`947`	`public void Properties_Add_ValueAndType_DateTimeArray_DateTime()`
`948`	`948`	`{`
`949`	`949`	`DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);`
`@@ -964,7 +964,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_DateTime()`
`964`	`964`	`Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");`
`965`	`965`	`}`
`966`	`966`
`967`		`- [TDDFact]`
	`967`	`+ [Fact]`
`968`	`968`	`public void Properties_Add_ValueAndType_DateTimeArray_TimeSpan()`
`969`	`969`	`{`
`970`	`970`	`TimeSpan myInterval1 = TimeSpan.FromSeconds(123);`
`@@ -985,7 +985,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_TimeSpan()`
`985`	`985`	`Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");`
`986`	`986`	`}`
`987`	`987`
`988`		`- [TDDFact]`
	`988`	`+ [Fact]`
`989`	`989`	`public void Properties_Add_ValueAndType_DateTimeArray_Mixed()`
`990`	`990`	`{`
`991`	`991`	`DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);`
`@@ -1006,7 +1006,7 @@ public void Properties_Add_ValueAndType_DateTimeArray_Mixed()`
`1006`	`1006`	`Assert.Equal(CimType.DateTimeArray, addedProperty.CimType, "addedProperty.CimType is not correct");`
`1007`	`1007`	`}`
`1008`	`1008`
`1009`		`- [TDDFact]`
	`1009`	`+ [Fact]`
`1010`	`1010`	`public void Properties_Add_ValueAndType_DateTimeArray_Mixed_InferredType()`
`1011`	`1011`	`{`
`1012`	`1012`	`DateTime myDate1 = new DateTime(2010, 09, 22, 7, 30, 0, DateTimeKind.Local);`