Changeset 1861

Timestamp:

11/02/09 10:33:32 (2 months ago)

Author:

borrillis

Message:

-updated TypeMock? Isolator to 5.4.3

• Corrected AAB.Merge test
• corrected GpuProgramParameters?.SetMatric?4Constant Test

Location:

trunk/Projects/Tests/Axiom.Tests

Files:

• Axiom.Tests.csproj (modified) (2 diffs)
• Graphics/GpuProgramParametersTestFixture.cs (modified) (2 diffs)
• Math/AxisAlignedBoxTest.cs (modified) (1 diff)

trunk/Projects/Tests/Axiom.Tests/Axiom.Tests.csproj

@@ -63 +63 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="TypeMock, Version=5.3.5.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL" />
-    <Reference Include="Typemock.ArrangeActAssert, Version=5.3.5.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL" />
+    <Reference Include="TypeMock, Version=5.4.3.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL" />
+    <Reference Include="Typemock.ArrangeActAssert, Version=5.4.3.0, Culture=neutral, PublicKeyToken=3dae460033b8d8e2, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
@@ -117 +117 @@
       <Name>Axiom %28Axiom\Axiom%29</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Axiom\Platforms\Win32\Axiom.Platforms.Win32.csproj">
+      <Project>{77AC0D3A-2A99-4EA6-A90E-C71BB53751C5}</Project>
+      <Name>Axiom.Platforms.Win32</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Axiom\RenderSystems\DirectX9\Axiom.RenderSystems.DirectX9.csproj">
       <Project>{68DBB62F-F98D-47B5-A769-C20B461227AB}</Project>

trunk/Projects/Tests/Axiom.Tests/Graphics/GpuProgramParametersTestFixture.cs

@@ -105 +105 @@
                                         (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom(),
                                         (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom(), (float)Utility.SymmetricRandom() };
-            float[] actual;
+
+            float[] actual = new float[16];
 
             GpuProgramParameters parameters = new GpuProgramParameters();
@@ -116 +117 @@
 
             Assert.IsTrue( parameters.GetFloatConstant( 0 ).isSet );
-            actual = parameters.GetFloatConstant( 0 ).val;
+            Assert.IsTrue( parameters.GetFloatConstant( 1 ).isSet );
+            Assert.IsTrue( parameters.GetFloatConstant( 2 ).isSet );
+            Assert.IsTrue( parameters.GetFloatConstant( 3 ).isSet );
+            parameters.GetFloatConstant( 0 ).val.CopyTo( actual, 0 ) ;
+            parameters.GetFloatConstant( 1 ).val.CopyTo( actual, 4 );
+            parameters.GetFloatConstant( 2 ).val.CopyTo( actual, 8 );
+            parameters.GetFloatConstant( 3 ).val.CopyTo( actual, 12 );
+
             Assert.AreEqual( expected, actual );
         }

trunk/Projects/Tests/Axiom.Tests/Math/AxisAlignedBoxTest.cs

@@ -39 +39 @@
 
             AxisAlignedBox[] expected = {
-                                            new AxisAlignedBox( new Vector3( -500.00000f, 0.00000000f, 500.00000f ),
-                                                                new Vector3( -499.00000f, 1.0000000f, 501.00000f ) ),
+                                            new AxisAlignedBox( new Vector3( -500.00000f, -0.50000000f, -0.50000000f ),
+                                                                new Vector3( 0.50000000f, 1.0000000f, 501.00000f ) ),
                                         };