2009-05-18 Rodrigo Kumpera <rkumpera@novell.com>

	* cli-tables-tests.md: Add tests for the manifest resource table.

	* Makefile: Update to the new dependency.

	* assembly-with-resource.cs: Add an exported type to be used
	by the new tests.

svn path=/trunk/mono/; revision=134361

diff --git a/mono/tests/metadata-verifier/Changelog b/mono/tests/metadata-verifier/Changelog
index c8648e8d536e3f18142f6becd70569246857ffd5..a7709a48c21e72649e5465d5131be6a3de561d33 100644 (file)
--- a/mono/tests/metadata-verifier/Changelog
+++ b/mono/tests/metadata-verifier/Changelog
@@ -1,3 +1,16 @@
+2009-05-18 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * cli-tables-tests.md: Add tests for the manifest resource table.
+
+       * Makefile: Update to the new dependency.
+
+       * assembly-with-resource.cs: Add an exported type to be used
+       by the new tests.
+
+2009-05-15 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * cli-tables-tests.md: Add tests for the manifest resource table.
+
 2009-05-15 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * cli-tables-tests.md: Add tests for the exported type table.

diff --git a/mono/tests/metadata-verifier/Makefile b/mono/tests/metadata-verifier/Makefile
index 6ff3863e88fd537a68299dcaf1aa4abc7d8b6e5c..679b227e886bd57f28eec40d35db2d18aaa139d3 100644 (file)
--- a/mono/tests/metadata-verifier/Makefile
+++ b/mono/tests/metadata-verifier/Makefile
@@ -47,6 +47,7 @@ TEST_BINARIES = assembly-with-resource.exe \
        assembly-with-events.exe \
        assembly-with-properties.exe \
        assembly-with-module.exe \
+       assembly-with-resource.exe \
        simple-assembly.exe
 
 

diff --git a/mono/tests/metadata-verifier/assembly-with-resource.cs b/mono/tests/metadata-verifier/assembly-with-resource.cs
index d0270c733975c804ba6d9c744df4b5dfa783be2e..bb1a8d430fe4f7d311b9bcdcb1fdf30cdc41dcba 100644 (file)
--- a/mono/tests/metadata-verifier/assembly-with-resource.cs
+++ b/mono/tests/metadata-verifier/assembly-with-resource.cs
@@ -1,4 +1,8 @@
 using System;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+
+[assembly:TypeForwardedTo(typeof(AssemblyBuilder))]
 
 public class Driver
 {

diff --git a/mono/tests/metadata-verifier/cli-tables-tests.md b/mono/tests/metadata-verifier/cli-tables-tests.md
index 345c69371143865f1da8145502da70940f042db9..a052a4e19260d97793aa9026c89bf2f70ac89adf 100644 (file)
--- a/mono/tests/metadata-verifier/cli-tables-tests.md
+++ b/mono/tests/metadata-verifier/cli-tables-tests.md
@@ -1118,3 +1118,50 @@ exported-type-table {
        #TODO check for dups (14,15,16)
 }
 
+manifest-resource-table {
+       assembly assembly-with-resource.exe
+
+       #flags must have a valid value (3)
+       #only bits 0-2 are used
+       invalid offset table-row (0x28 0) + 4 set-bit 3
+       invalid offset table-row (0x28 0) + 4 set-bit 7
+       invalid offset table-row (0x28 0) + 4 set-bit 16
+       invalid offset table-row (0x28 0) + 4 set-bit 31
+
+       #inly 0x1 and 0x2 are valid visibility values (4)
+       invalid offset table-row (0x28 0) + 4 set-uint 0
+       invalid offset table-row (0x28 0) + 4 set-uint 3
+       invalid offset table-row (0x28 0) + 4 set-uint 4
+       invalid offset table-row (0x28 0) + 4 set-uint 5
+       invalid offset table-row (0x28 0) + 4 set-uint 6
+       invalid offset table-row (0x28 0) + 4 set-uint 7
+
+       #name shall index a valid non-empty (5)
+       invalid offset table-row (0x28 0) + 8 set-ushort 0
+       invalid offset table-row (0x28 0) + 8 set-ushort 0x9900
+
+       #if implementation is null the offset is a valid offset based on cli resource entry (7)
+       valid offset table-row (0x28 0) + 10 set-ushort 0,
+                       offset table-row (0x28 0) + 0  set-uint 1
+
+       #LAMEIMPL it doesn't check the resource offset! 
+       invalid offset table-row (0x28 0) + 10 set-ushort 0,
+                       offset table-row (0x28 0) + 0  set-uint 0x990000
+       
+
+       #implementation is a valid token (8)
+       #does it accept exported type? 
+       invalid offset table-row (0x28 0) + 10 set-ushort 0x0006
+
+       #coded table 4 is invalid
+       invalid offset table-row (0x28 0) + 10 set-ushort 0x0007
+       #bad index
+       invalid offset table-row (0x28 0) + 10 set-ushort 0x8800
+       invalid offset table-row (0x28 0) + 10 set-ushort 0x8801
+
+       #if implementation point to a file it's index must be zero (10)
+       #row 0 is a file resource
+       invalid offset table-row (0x28 0) set-uint 1
+       
+       #TODO check for dups (9)
+}