diff --git a/Makefile.am b/Makefile.am index becf4e324a..ede7695649 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,9 +45,6 @@ dist-hook: rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'` rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'` -mac-sdk-package: - external/bockbuild/bb MacSDK --package - pkgconfigdir = $(libdir)/pkgconfig noinst_DATA = mono-uninstalled.pc DISTCLEANFILES= mono-uninstalled.pc diff --git a/Makefile.in b/Makefile.in index f99dad1ac6..20b833affd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -948,9 +948,6 @@ dist-hook: rm -rf `find $(top_distdir)/external -path '*\.git'` rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'` rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'` - -mac-sdk-package: - external/bockbuild/bb MacSDK --package .PHONY: get-monolite-latest get-monolite-latest: -rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION) diff --git a/README.md b/README.md index c530d4a18b..87b0113750 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or | Windows | amd64 | [![windows-amd64][15]][16] | | Windows | i386 | [![windows-amd64][17]][18] | | CentOS | s390x (cs) | [![centos-s390x][19]][20] | +| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]| _(cs) = community supported architecture_ @@ -50,8 +51,10 @@ _(cs) = community supported architecture_ [16]: https://jenkins.mono-project.com/job/z/label=w64/ [17]: https://jenkins.mono-project.com/job/z/label=w32/badge/icon [18]: https://jenkins.mono-project.com/job/z/label=w32/ -[19]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon -[20]: https://jenkins.mono-project.com/job/z/label=centos-s390x +[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon +[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x +[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon +[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el Compilation and Installation ============================ diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index 9df7b8a581..1fedbe94fe 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -18,7 +18,7 @@ { "name": "ms-test-suite", "url": "git@github.com:xamarin/ms-test-suite.git", - "rev": "55b6637eb1de61c743323ec82db1e0cadfee5b32", + "rev": "73c155f76b55839f26ba707d6d40091060e4f5d8", "remote-branch": "origin/master", "branch": "master", "directory": "ms-test-suite" diff --git a/config.h.in b/config.h.in index 9fc90c9a51..8ef567c3e9 100644 --- a/config.h.in +++ b/config.h.in @@ -15,9 +15,6 @@ /* Disable support for multiple appdomains. */ #undef DISABLE_APPDOMAINS -/* Disable assembly remapping. */ -#undef DISABLE_ASSEMBLY_REMAPPING - /* Disable agent attach support */ #undef DISABLE_ATTACH @@ -30,6 +27,9 @@ /* Disable System.Decimal support */ #undef DISABLE_DECIMAL +/* Disable desktop assembly loader semantics. */ +#undef DISABLE_DESKTOP_LOADER + /* Disable generics support */ #undef DISABLE_GENERICS @@ -142,7 +142,7 @@ /* Icall symbol map enabled */ #undef ENABLE_ICALL_SYMBOL_MAP -/* Enable interpreter in the runtime. */ +/* Enable Interpreter */ #undef ENABLE_INTERPRETER /* Enable the LLVM back end */ @@ -488,6 +488,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_SERIAL_H +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + /* Define to 1 if you have the `lockf' function. */ #undef HAVE_LOCKF @@ -503,6 +506,9 @@ /* Have mincore */ #undef HAVE_MINCORE +/* Define to 1 if you have the `mkdtemp' function. */ +#undef HAVE_MKDTEMP + /* Define to 1 if you have the `mknodat' function. */ #undef HAVE_MKNODAT @@ -824,6 +830,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EPOLL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_ERRNO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EVENT_H @@ -1037,7 +1046,7 @@ /* Enable lazy gc thread creation by the embedding host. */ #undef LAZY_GC_THREAD_CREATION -/* Full version of LLVM libraties */ +/* Full version of LLVM libraries */ #undef LLVM_VERSION /* Define to the sub-directory in which libtool stores uninstalled libraries. diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1b9b77cda6..812f4d40fe 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -54cea42c8c6bfe077b1977bc3905769ad937e124 \ No newline at end of file +48d34844b9ae0c66ad031a44de6c7687c4c9b49b \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 8537c3848f..fc8424486a 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -3ac346edc244dc2c78aa095b77807d043420bd49 \ No newline at end of file +0256ba4d773c9c56b5f4df4ca3befad03ba0df26 \ No newline at end of file diff --git a/data/config.in b/data/config.in index be83151429..282bc11495 100644 --- a/data/config.in +++ b/data/config.in @@ -18,8 +18,14 @@ + + + + + + diff --git a/data/lldb/monobt.py b/data/lldb/monobt.py index 0e4713816d..8b2a973b82 100644 --- a/data/lldb/monobt.py +++ b/data/lldb/monobt.py @@ -9,16 +9,38 @@ def print_frames(thread, num_frames, current_thread): for frame in thread.frames[:+num_frames]: pc = str(frame.addr) - fmt = ' %c %s' var = frame - if pc[0] == '0': + function_name = frame.GetFunctionName() + if function_name == "ves_exec_method_with_context": + try: + s = 'frame->runtime_method->method' + klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1] + methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1] + + ipoffset = frame.EvaluateExpression('ip').GetValueAsUnsigned() + insn = '' + if ipoffset != 0: + ipoffset -= frame.EvaluateExpression('rtm->code').GetValueAsUnsigned() + insn = "\"" + frame.EvaluateExpression('mono_interp_opname [*ip]').summary[1:-1] + "\"" + var = '%s::%s @ %d %s || %s' % (klassname, methodname, ipoffset, insn, frame) + except Exception as e: + print "DBG: execfail:" + str(e) + elif function_name == "mono_interp_transform_method": + try: + s = 'runtime_method->method' + klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1] + methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1] + var = 'transforming %s::%s || %s' % (klassname, methodname, frame) + except Exception as e: + print "DBG: transformfail:" + str(e) + elif pc[0] == '0': try: framestr = frame.EvaluateExpression('(char*)mono_pmip((void*)%s)' % pc).summary[1:-1] var = 'frame #%i: %s%s' % (frame.idx, pc, framestr) except: pass - print fmt % ('*' if current_thread and frame.idx == selected_frame.idx else ' ', var) + print ' %c %s' % ('*' if current_thread and frame.idx == selected_frame.idx else ' ', var) def monobt(debugger, command, result, dict): opts = {'all_bt': False, 'num_frames': None} @@ -53,4 +75,5 @@ def __lldb_init_module (debugger, dict): # This initializer is being run from LLDB in the embedded command interpreter # Add any commands contained in this module to LLDB debugger.HandleCommand('command script add -f monobt.monobt monobt') - print '"monobt" command installed' \ No newline at end of file + debugger.HandleCommand('command alias mbt monobt') + print '"monobt" command installed' diff --git a/docs/Makefile.am b/docs/Makefile.am index 99652f30dc..95519541ea 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -87,7 +87,7 @@ mono-file-formats.zip: mono-file-formats.tree mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp $(TOOL_MAKE) $@ -deploy/.stamp: convert.exe Makefile.am +deploy/.stamp: convert.exe Makefile.am exdoc $(mkdir_p) html runtimedir=`cd ../runtime && pwd`; export runtimedir; \ MONO_PATH=$(CLASS) perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c diff --git a/docs/Makefile.in b/docs/Makefile.in index 04a5d5dca9..f27d60913b 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -666,7 +666,7 @@ mono-file-formats.zip: mono-file-formats.tree mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp $(TOOL_MAKE) $@ -deploy/.stamp: convert.exe Makefile.am +deploy/.stamp: convert.exe Makefile.am exdoc $(mkdir_p) html runtimedir=`cd ../runtime && pwd`; export runtimedir; \ MONO_PATH=$(CLASS) perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c diff --git a/docs/abc-removal.txt b/docs/abc-removal.txt index b44089c0de..5c2ce91fd5 100755 --- a/docs/abc-removal.txt +++ b/docs/abc-removal.txt @@ -26,7 +26,7 @@ some combination of the two. To be clearer, and give an idea of what the algorithm can and cannot do without describing it in detail... keep in mind that - only "redunant" checks cannot be removed. By "redundant", I + only "redundant" checks cannot be removed. By "redundant", I mean "already explicitly checked" in the method code. Unfortunately, analyzing complex expressions is not so easy @@ -136,7 +136,7 @@ some combination of the two. In the first case, the BB has exactly two exit BBs, and their execution conditions are easy to get from the condition of the branch (see the "get_relation_from_branch_instruction" - function, and expecially the end of "analyze_block" in + function, and especially the end of "analyze_block" in abcremoval.c. If there is a switch, the jump condition of every exit BB is @@ -303,7 +303,7 @@ some combination of the two. each BB tried to examine all possible conditions between all variables, filling a sort of "evaluation matrix". The problem was that the complexity of this evaluation was quadratic (or - worse) on the number of variables, and that many wariables + worse) on the number of variables, and that many variables were examined even if they were not involved in any array access. @@ -332,7 +332,7 @@ some combination of the two. [1b] Prepare the evaluation graph (empty) - [1b] Summarize each varible definition, and put + [1b] Summarize each variable definition, and put the resulting relations in the evaluation graph diff --git a/docs/deploy/mono-api-assembly.html b/docs/deploy/mono-api-assembly.html index d24e02bac2..123928bf7e 100644 --- a/docs/deploy/mono-api-assembly.html +++ b/docs/deploy/mono-api-assembly.html @@ -239,10 +239,8 @@ mono_assembly_close (MonoAssembly *assembly)

Parameters
-
assembly the assembly to release.
Description
-

- This method releases a reference to the assembly. The assembly is - only released when all the outstanding references to it are released.

+
assembly the assembly to release.
Description
+

This method releases a reference to the assembly. The assembly is only released when all the outstanding references to it are released.

@@ -256,8 +254,15 @@ mono_assembly_close (MonoAssembly *assembly)
Syntax
-
mono_assembly_get_object
+
MonoReflectionAssembly* +mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly) + +

+

Parameters
+
domain an app domain
assembly an assembly
Return value
+
a System.Reflection.Assembly object representing the MonoAssembly assembly. +
@@ -277,15 +282,12 @@ mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenS

Parameters
-
aname A MonoAssemblyName with the assembly name to load.
basedir A directory to look up the assembly at.
status a pointer to a MonoImageOpenStatus to return the status of the load operation
Return value
-
the assembly referenced by aname loaded or NULL on error. On error the +
aname A MonoAssemblyName with the assembly name to load.
basedir A directory to look up the assembly at.
status a pointer to a MonoImageOpenStatus to return the status of the load operation
Return value
+
the assembly referenced by aname loaded or NULL on error. On error the - value pointed by status is updated with an error code.
+ value pointed by status is updated with an error code.
Description
-

- Loads the assembly referenced by aname, if the value of basedir is not NULL, it - attempts to load the assembly from that directory before probing the standard locations. -

+

Loads the assembly referenced by aname, if the value of basedir is not NULL, it attempts to load the assembly from that directory before probing the standard locations.

@@ -305,18 +307,12 @@ mono_assembly_load_full (MonoAssemblyName *aname, const char *basedir, MonoImage

Parameters
-
aname A MonoAssemblyName with the assembly name to load.
basedir A directory to look up the assembly at.
status a pointer to a MonoImageOpenStatus to return the status of the load operation
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
-
the assembly referenced by aname loaded or NULL on error. On error the +
aname A MonoAssemblyName with the assembly name to load.
basedir A directory to look up the assembly at.
status a pointer to a MonoImageOpenStatus to return the status of the load operation
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
+
the assembly referenced by aname loaded or NULL on error. On error the - value pointed by status is updated with an error code.
+ value pointed by status is updated with an error code.
Description
-

- Loads the assembly referenced by aname, if the value of basedir is not NULL, it - attempts to load the assembly from that directory before probing the standard locations. -

- If the assembly is being opened in reflection-only mode (refonly set to TRUE) then no - assembly binding takes place. -

+

Loads the assembly referenced by aname, if the value of basedir is not NULL, it attempts to load the assembly from that directory before probing the standard locations.

If the assembly is being opened in reflection-only mode (refonly set to TRUE) then no assembly binding takes place.

@@ -336,14 +332,12 @@ mono_assembly_loaded (MonoAssemblyName *aname)

Parameters
-
aname an assembly to look for.
Return value
-
NULL If the given aname assembly has not been loaded, or a pointer to +
aname an assembly to look for.
Return value
+
NULL If the given aname assembly has not been loaded, or a pointer to a MonoAssembly that matches the MonoAssemblyName specified.
Description
-

- This is used to determine if the specified assembly has been loaded -

+

This is used to determine if the specified assembly has been loaded

@@ -364,24 +358,17 @@ mono_assembly_load_from (MonoImage *image, const char *fname,

Parameters
-
image Image to load the assembly from
fname assembly name to associate with the assembly
status return status code
Return value
-
A valid pointer to a MonoAssembly* on success and the status will be +
image Image to load the assembly from
fname assembly name to associate with the assembly
status return status code
Return value
+
A valid pointer to a MonoAssembly* on success and then status will be - set to MONO_IMAGE_OK; or NULL on error. + set to MONO_IMAGE_OK; or NULL on error.

If there is an error loading the assembly the status will indicate the reason with status being set to MONO_IMAGE_INVALID if the image did not contain an assembly reference table.

Description
-

- If the provided image has an assembly reference, it will process the given - image as an assembly with the given name. -

- Most likely you want to use the api:mono_assembly_load_full method instead. -

- This is equivalent to calling api:mono_assembly_load_from_full with the - refonly parameter set to FALSE.

+

If the provided image has an assembly reference, it will process the given image as an assembly with the given name.

Most likely you want to use the `api:mono_assembly_load_full` method instead.

This is equivalent to calling `api:mono_assembly_load_from_full` with the refonly parameter set to FALSE.

@@ -402,8 +389,8 @@ mono_assembly_load_from_full (MonoImage *image, const char*fname,

Parameters
-
image Image to load the assembly from
fname assembly name to associate with the assembly
status returns the status condition
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
-
A valid pointer to a MonoAssembly* on success and the status will be +
image Image to load the assembly from
fname assembly name to associate with the assembly
status returns the status condition
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
+
A valid pointer to a MonoAssembly* on success and the status will be set to MONO_IMAGE_OK; or NULL on error.

@@ -411,12 +398,7 @@ mono_assembly_load_from_full (MonoImage *image, const char*fname, reason with status being set to MONO_IMAGE_INVALID if the image did not contain an assembly reference table.

Description
-

- If the provided image has an assembly reference, it will process the given - image as an assembly with the given name. -

- Most likely you want to use the api:mono_assembly_load_full method instead. -

+

If the provided image has an assembly reference, it will process the given image as an assembly with the given name.

Most likely you want to use the `api:mono_assembly_load_full` method instead.

@@ -436,21 +418,11 @@ mono_assembly_load_with_partial_name (const char *name, MonoImageOpenStatus *sta

Parameters
-
name an assembly name that is then parsed by api:mono_assembly_name_parse.
status return status code
Return value
-
NULL on failure, or a pointer to a MonoAssembly on success. +
name an assembly name that is then parsed by `api:mono_assembly_name_parse`.
status return status code
Return value
+
NULL on failure, or a pointer to a MonoAssembly on success.
Description
-

- Loads a Mono Assembly from a name. The name is parsed using api:mono_assembly_name_parse, - so it might contain a qualified type name, version, culture and token. -

- This will load the assembly from the file whose name is derived from the assembly name - by appending the .dll extension. -

- The assembly is loaded from either one of the extra Global Assembly Caches specified - by the extra GAC paths (specified by the MONO_GAC_PREFIX environment variable) or - if that fails from the GAC. -

+

Loads a MonoAssembly from a name. The name is parsed using `api:mono_assembly_name_parse`, so it might contain a qualified type name, version, culture and token.

This will load the assembly from the file whose name is derived from the assembly name by appending the .dll extension.

The assembly is loaded from either one of the extra Global Assembly Caches specified by the extra GAC paths (specified by the MONO_GAC_PREFIX environment variable) or if that fails from the GAC.

@@ -470,26 +442,13 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)

Parameters
-
filename Opens the assembly pointed out by this name
status return status code
Return value
-
a pointer to the MonoAssembly if filename contains a valid +
filename Opens the assembly pointed out by this name
status return status code
Return value
+
a pointer to the MonoAssembly if filename contains a valid assembly or NULL on error. Details about the error are stored in the status variable.
Description
-

- This loads an assembly from the specified filename. The filename allows - a local URL (starting with a file:// prefix). If a file prefix is used, the - filename is interpreted as a URL, and the filename is URL-decoded. Otherwise the file - is treated as a local path. -

- First, an attempt is made to load the assembly from the bundled executable (for those - deployments that have been done with the mkbundle tool or for scenarios where the - assembly has been registered as an embedded assembly). If this is not the case, then - the assembly is loaded from disk using api:mono_image_open_full. -

- If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of - the assembly is made. -

+

This loads an assembly from the specified filename. The filename allows a local URL (starting with a file:// prefix). If a file prefix is used, the filename is interpreted as a URL, and the filename is URL-decoded. Otherwise the file is treated as a local path.

First, an attempt is made to load the assembly from the bundled executable (for those deployments that have been done with the mkbundle tool or for scenarios where the assembly has been registered as an embedded assembly). If this is not the case, then the assembly is loaded from disk using `api:mono_image_open_full`.

If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of the assembly is made.

@@ -503,8 +462,18 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
Syntax
-
mono_assembly_open_full
+
MonoAssembly* +mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboolean refonly) + +

+

Parameters
+
filename the file to load
status return status code
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
+
NULL on error, with the status set to an error code, or a pointer + + to the assembly.
+
Description
+

This loads an assembly from the specified filename. The filename allows a local URL (starting with a file:// prefix). If a file prefix is used, the filename is interpreted as a URL, and the filename is URL-decoded. Otherwise the file is treated as a local path.

First, an attempt is made to load the assembly from the bundled executable (for those deployments that have been done with the mkbundle tool or for scenarios where the assembly has been registered as an embedded assembly). If this is not the case, then the assembly is loaded from disk using `api:mono_image_open_full`.

If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of the assembly is made.

If refonly is set to true, then the assembly is loaded purely for inspection with the System.Reflection API.

@@ -524,16 +493,8 @@ mono_set_assemblies_path (const char* path)

Parameters
-
path list of paths that contain directories where Mono will look for assemblies
Description
-

- Use this method to override the standard assembly lookup system and - override any assemblies coming from the GAC. This is the method - that supports the MONO_PATH variable. -

- Notice that MONO_PATH and this method are really a very bad idea as - it prevents the GAC from working and it prevents the standard - resolution mechanisms from working. Nonetheless, for some debugging - situations and bootstrapping setups, this is useful to have.

+
path list of paths that contain directories where Mono will look for assemblies
Description
+

Use this method to override the standard assembly lookup system and override any assemblies coming from the GAC. This is the method that supports the MONO_PATH variable.

Notice that MONO_PATH and this method are really a very bad idea as it prevents the GAC from working and it prevents the standard resolution mechanisms from working. Nonetheless, for some debugging situations and bootstrapping setups, this is useful to have.

@@ -553,9 +514,7 @@ mono_set_rootdir (void)

Description
-

- Registers the root directory for the Mono runtime, for Linux and Solaris 10, - this auto-detects the prefix where Mono was installed.

+

Registers the root directory for the Mono runtime, for Linux and Solaris 10, this auto-detects the prefix where Mono was installed.

@@ -573,8 +532,15 @@ mono_set_rootdir (void)
Syntax
-
mono_assembly_fill_assembly_name
+
gboolean +mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname) + +

+

Parameters
+
image Image
aname Name
Return value
+
TRUE if successful +
@@ -594,14 +560,8 @@ mono_assembly_foreach (GFunc func, gpointer user_data)

Parameters
-
func function to invoke for each assembly loaded
user_data data passed to the callback
Description
-

- Invokes the provided func callback for each assembly loaded into - the runtime. The first parameter passed to the callback is the - MonoAssembly*, and the second parameter is the user_data. -

- This is done for all assemblies loaded in the runtime, not just - those loaded in the current application domain.

+
func function to invoke for each assembly loaded
user_data data passed to the callback
Description
+

Invokes the provided func callback for each assembly loaded into the runtime. The first parameter passed to the callback is the MonoAssembly*, and the second parameter is the user_data.

This is done for all assemblies loaded in the runtime, not just those loaded in the current application domain.

@@ -621,11 +581,11 @@ mono_assembly_get_image (MonoAssembly *assembly)

Parameters
-
assembly The assembly to retrieve the image from
Return value
-
the MonoImage associated with this assembly. +
assembly The assembly to retrieve the image from
Return value
+
the MonoImage associated with this assembly.
Description
-

+

@@ -645,10 +605,10 @@ mono_assembly_get_main (void)

Return value
-
the assembly for the application, the first assembly that is loaded by the VM +
the assembly for the application, the first assembly that is loaded by the VM
Description
-

+

@@ -668,13 +628,11 @@ mono_assembly_get_name (MonoAssembly *assembly)

Parameters
-
assembly The assembly to retrieve the name from
Return value
-
the MonoAssemblyName associated with this assembly. +
assembly The assembly to retrieve the name from
Return value
+
the MonoAssemblyName associated with this assembly.
Description
-

- The returned name's lifetime is the same as assembly's. -

+

The returned name's lifetime is the same as assembly's.

@@ -694,12 +652,10 @@ mono_assembly_getrootdir (void)

Return value
-
a string with the directory, this string should not be freed. +
a string with the directory, this string should not be freed.
Description
-

- Obtains the root directory used for looking up assemblies. -

+

Obtains the root directory used for looking up assemblies.

@@ -719,9 +675,8 @@ mono_assembly_get_assemblyref (MonoImage *image, int index, MonoAssemblyName *an

Parameters
-
image pointer to the MonoImage to extract the information from.
index index to the assembly reference in the image.
aname pointer to a MonoAssemblyName that will hold the returned value.
Description
-

- Fills out the aname with the assembly name of the index assembly reference in image.

+
image pointer to the MonoImage to extract the information from.
index index to the assembly reference in the image.
aname pointer to a MonoAssemblyName that will hold the returned value.
Description
+

Fills out the aname with the assembly name of the index assembly reference in image.

@@ -741,13 +696,12 @@ mono_assembly_loaded_full (MonoAssemblyName *aname, gboolean refonly)

Parameters
-
aname an assembly to look for.
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
-
NULL If the given aname assembly has not been loaded, or a pointer to +
aname an assembly to look for.
refonly Whether this assembly is being opened in "reflection-only" mode.
Return value
+
NULL If the given aname assembly has not been loaded, or a pointer to a MonoAssembly that matches the MonoAssemblyName specified.
Description
-

- This is used to determine if the specified assembly has been loaded

+

This is used to determine if the specified assembly has been loaded

@@ -761,7 +715,10 @@ mono_assembly_loaded_full (MonoAssemblyName *aname, gboolean refonly)
Syntax
-
mono_assembly_load_reference
+
void +mono_assembly_load_reference (MonoImage *image, int index) + +

@@ -782,9 +739,8 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)

Parameters
-
image
status
Description
-

- This method is now a no-op, it does nothing other than setting the status to MONO_IMAGE_OK

+
image
status
Description
+

This method is now a no-op, it does nothing other than setting the status to MONO_IMAGE_OK

@@ -798,7 +754,10 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
Syntax
-
mono_assembly_load_module
+
MonoImage* +mono_assembly_load_module (MonoAssembly *assembly, guint32 idx) + +

@@ -813,7 +772,10 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)

Syntax
-
mono_assembly_invoke_load_hook
+
void +mono_assembly_invoke_load_hook (MonoAssembly *ass) + +

@@ -828,7 +790,10 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)

Syntax
-
mono_assembly_invoke_search_hook
+
MonoAssembly* +mono_assembly_invoke_search_hook (MonoAssemblyName *aname) + +

@@ -843,7 +808,10 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)

Syntax
-
mono_assembly_set_main
+
void +mono_assembly_set_main (MonoAssembly *assembly) + +

@@ -864,14 +832,8 @@ mono_assembly_setrootdir (const char *root_dir)

Parameters
-
root_dir The pathname of the root directory where we will locate assemblies
Description
-

- This routine sets the internal default root directory for looking up - assemblies. -

- This is used by Windows installations to compute dynamically the - place where the Mono assemblies are located. -

+
root_dir The pathname of the root directory where we will locate assemblies
Description
+

This routine sets the internal default root directory for looking up assemblies.

This is used by Windows installations to compute dynamically the place where the Mono assemblies are located.

@@ -885,7 +847,10 @@ mono_assembly_setrootdir (const char *root_dir)
Syntax
-
mono_register_config_for_assembly
+
void +mono_register_config_for_assembly (const char* assembly_name, const char* config_xml) + +

@@ -900,7 +865,10 @@ mono_assembly_setrootdir (const char *root_dir)

Syntax
-
mono_register_symfile_for_assembly
+
void +mono_register_symfile_for_assembly (const char *assembly_name, const mono_byte *raw_contents, int size) + +

@@ -932,14 +900,11 @@ mono_assembly_name_new (const char *name)

Parameters
-
name name to parse
Return value
-
a newly allocated structure or NULL if there was any failure. +
name name to parse
Return value
+
a newly allocated structure or NULL if there was any failure.
Description
-

- Allocate a new MonoAssemblyName and fill its values from the - passed name. -

+

Allocate a new MonoAssemblyName and fill its values from the passed name.

@@ -953,7 +918,10 @@ mono_assembly_name_new (const char *name)
Syntax
-
mono_assembly_name_get_name
+
const char* +mono_assembly_name_get_name (MonoAssemblyName *aname) + +

@@ -968,7 +936,10 @@ mono_assembly_name_new (const char *name)

Syntax
-
mono_assembly_name_get_culture
+
const char* +mono_assembly_name_get_culture (MonoAssemblyName *aname) + +

@@ -983,7 +954,10 @@ mono_assembly_name_new (const char *name)

Syntax
-
mono_assembly_name_get_version
+
uint16_t +mono_assembly_name_get_version (MonoAssemblyName *aname, uint16_t *minor, uint16_t *build, uint16_t *revision) + +

@@ -998,7 +972,10 @@ mono_assembly_name_new (const char *name)

Syntax
-
mono_assembly_name_get_pubkeytoken
+
mono_byte* +mono_assembly_name_get_pubkeytoken (MonoAssemblyName *aname) + +

@@ -1019,10 +996,8 @@ mono_assembly_name_free (MonoAssemblyName *aname)

Parameters
-
aname assembly name to free
Description
-

- Frees the provided assembly name object. - (it does not frees the object itself, only the name members).

+
aname assembly name to free
Description
+

Frees the provided assembly name object. (it does not frees the object itself, only the name members).

@@ -1042,15 +1017,12 @@ mono_stringify_assembly_name (MonoAssemblyName *aname)

Parameters
-
aname the assembly name.
Return value
-
a newly allocated string with a string representation of +
aname the assembly name.
Return value
+
a newly allocated string with a string representation of the assembly name.
Description
-

- Convert aname into its string format. The returned string is dynamically - allocated and should be freed by the caller. -

+

Convert aname into its string format. The returned string is dynamically allocated and should be freed by the caller.

@@ -1070,16 +1042,11 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Parameters
-
l first assembly
r second assembly.
Return value
-
TRUE if both assembly names are equal. +
l first assembly
r second assembly.
Return value
+
TRUE if both assembly names are equal.
Description
-

- Compares two MonoAssemblyNames and returns whether they are equal. -

- This compares the names, the cultures, the release version and their - public tokens. -

+

Compares two MonoAssemblyName instances and returns whether they are equal.

This compares the names, the cultures, the release version and their public tokens.

@@ -1099,7 +1066,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)
Syntax
-
mono_module_file_get_object
+
MonoReflectionModule* +mono_module_file_get_object (MonoDomain *domain, MonoImage *image, int table_index) + +

@@ -1114,7 +1084,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_module_get_object
+
MonoReflectionModule* +mono_module_get_object (MonoDomain *domain, MonoImage *image) + +

@@ -1134,7 +1107,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_load_hook
+
void +mono_install_assembly_load_hook (MonoAssemblyLoadFunc func, gpointer user_data) + +

@@ -1149,7 +1125,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_search_hook
+
void +mono_install_assembly_search_hook (MonoAssemblySearchFunc func, gpointer user_data) + +

@@ -1164,7 +1143,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_refonly_search_hook
+
void +mono_install_assembly_refonly_search_hook (MonoAssemblySearchFunc func, gpointer user_data) + +

@@ -1179,7 +1161,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_preload_hook
+
void +mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data) + +

@@ -1194,7 +1179,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_refonly_preload_hook
+
void +mono_install_assembly_refonly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data) + +

@@ -1209,10 +1197,10 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)

Syntax
-
mono_install_assembly_postload_search_hook
+
void +mono_install_assembly_postload_search_hook (MonoAssemblySearchFunc func, gpointer user_data) + +

- - - diff --git a/docs/deploy/mono-api-class.html b/docs/deploy/mono-api-class.html index 357d6bfb3c..55f74024fd 100644 --- a/docs/deploy/mono-api-class.html +++ b/docs/deploy/mono-api-class.html @@ -235,9 +235,9 @@ mono_class_get (MonoImage *image, guint32 type_token)

Parameters
-
image image where the class token will be looked up.
type_token a type token from the image
Description
-

- Returns the MonoClass with the given type_token on the image

+
image image where the class token will be looked up.
type_token a type token from the image
Return value
+
the MonoClass with the given type_token on the image +
@@ -257,9 +257,9 @@ mono_class_from_mono_type (MonoType *type)

Parameters
-
type describes the type to return
Description
-

- This returns a MonoClass for the specified MonoType, the value is never NULL.

+
type describes the type to return
Return value
+
a MonoClass for the specified MonoType, the value is never NULL. +
@@ -279,21 +279,15 @@ mono_class_from_name (MonoImage *image, const char* name_space, const char *name

Parameters
-
image The MonoImage where the type is looked up in
name_space the type namespace
name the type short name.
Description
-

- Obtains a MonoClass with a given namespace and a given name which - is located in the given MonoImage. -

- To reference nested classes, use the "/" character as a separator. - For example use "Foo/Bar" to reference the class Bar that is nested - inside Foo, like this: "class Foo { class Bar {} }".

+
image The MonoImage where the type is looked up in
name_space the type namespace
name the type short name.
Description
+

Obtains a MonoClass with a given namespace and a given name which is located in the given MonoImage.

To reference nested classes, use the "/" character as a separator. For example use "Foo/Bar" to reference the class Bar that is nested inside Foo, like this: "class Foo { class Bar {} }".

-
mono_class_from_name_case
+
mono_class_from_name_case

Deprecated: use the mono_class_from_name_case_checked variant instead.
@@ -301,22 +295,13 @@ mono_class_from_name (MonoImage *image, const char* name_space, const char *name
Syntax
MonoClass* -mono_class_from_name_case_checked (MonoImage *image, const char *name_space, const char *name, MonoError *error) +mono_class_from_name_case (MonoImage *image, const char* name_space, const char *name)

Parameters
-
image The MonoImage where the type is looked up in
name_space the type namespace
name the type short name.
error if
Return value
-
The MonoClass if the given namespace and name were found, or NULL if it - - was not found. The error object will contain information about the problem - in that case.
-
Description
-

- Obtains a MonoClass with a given namespace and a given name which - is located in the given MonoImage. The namespace and name - lookups are case insensitive. -

+
image The MonoImage where the type is looked up in
name_space the type namespace
name the type short name.
Description
+

Obtains a MonoClass with a given namespace and a given name which is located in the given MonoImage. The namespace and name lookups are case insensitive.

@@ -336,14 +321,12 @@ mono_class_from_typeref (MonoImage *image, guint32 type_token)

Parameters
-
image a MonoImage
type_token a TypeRef token
Return value
-
The MonoClass* representing the typeref token, NULL ifcould +
image a MonoImage
type_token a TypeRef token
Return value
+
The MonoClass* representing the typeref token, or NULL if it could not be loaded.
Description
-

- Creates the MonoClass* structure representing the type defined by - the typeref token valid inside image.

+

Creates the MonoClass* structure representing the type defined by the typeref token valid inside image.

@@ -363,16 +346,13 @@ mono_class_from_typeref_checked (MonoImage *image, guint32 type_token, MonoError

Parameters
-
image a MonoImage
type_token a TypeRef token
error error return code, if any.
Return value
-
The MonoClass* representing the typeref token, NULL if it could +
image a MonoImage
type_token a TypeRef token
error error return code, if any.
Return value
+
The MonoClass* representing the typeref token, NULL if it could not be loaded with the error value filled with the information about the error.
Description
-

- Creates the MonoClass* structure representing the type defined by - the typeref token valid inside image. -

+

Creates the MonoClass* structure representing the type defined by the typeref token valid inside image.

@@ -392,7 +372,7 @@ mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *arg2 G_GN

Parameters
-
param Parameter to find/construct a class for.
arg2 Is ignored.
arg3 Is ignored.
+
param Parameter to find/construct a class for.
arg2 Is ignored.
arg3 Is ignored.

Working with a MonoClass

@@ -414,12 +394,11 @@ mono_class_array_element_size (MonoClass *klass)

Parameters
-
klass
Return value
-
The number of bytes an element of type klass - - uses when stored into an array.
+
klass
Return value
+
The number of bytes an element of type klass uses when stored into an array. +
Description
-

+

@@ -439,11 +418,11 @@ mono_class_data_size (MonoClass *klass)

Parameters
-
klass a class
Return value
-
The size of the static class data +
klass a class
Return value
+
The size of the static class data
Description
-

+

@@ -463,13 +442,11 @@ mono_class_enum_basetype (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The underlying type representation for an enumeration. +
klass the MonoClass to act on
Return value
+
The underlying type representation for an enumeration.
Description
-

- Use this function to get the underlying type for an enumeration value. -

+

Use this function to get the underlying type for an enumeration value.

@@ -489,9 +466,8 @@ mono_class_get_byref_type (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Description
-

-

+
klass the MonoClass to act on
Description
+

@@ -511,13 +487,11 @@ mono_class_get_element_class (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The element class of an array. +
klass the MonoClass to act on
Return value
+
The element class of an array.
Description
-

- Use this function to get the element class of an array. -

+

Use this function to get the element class of an array.

@@ -531,7 +505,10 @@ mono_class_get_element_class (MonoClass *klass)
Syntax
-
mono_class_get_event_token
+
guint32 +mono_class_get_event_token (MonoEvent *event) + +

@@ -552,13 +529,13 @@ mono_class_get_field (MonoClass *klass, guint32 field_token)

Parameters
-
class the class to lookup the field.
field_token the field token
Return value
-
A MonoClassField representing the type and offset of +
class the class to lookup the field.
field_token the field token
Return value
+
A MonoClassField representing the type and offset of the field, or a NULL value if the field does not belong to this class.
Description
-

+

@@ -578,14 +555,11 @@ mono_class_get_field_token (MonoClassField *field)

Parameters
-
field the field we need the token of
Return value
-
The token representing the field in the image it was loaded from. +
field the field we need the token of
Return value
+
The token representing the field in the image it was loaded from.
Description
-

- Get the token of a field. Note that the tokesn is only valid for the image - the field was loaded from. Don't use this function for fields in dynamic types. -

+

Get the token of a field. Note that the tokesn is only valid for the image the field was loaded from. Don't use this function for fields in dynamic types.

@@ -605,21 +579,17 @@ mono_class_get_flags (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The type flags -
-
Description
-

- Return the TypeAttributes flags of klass. - See the TYPE_ATTRIBUTE_* definitions on tabledefs.h for the different values. -

+
klass the MonoClass to act on
Return value
+
the TypeAttributes flags of klass. + + See the TYPE_ATTRIBUTE_* definitions in tabledefs.h for the different values.
-
mono_class_get_full

Deprecated: Functions that expose MonoGenericContext are going away in mono 4.0
+
mono_class_get_full

Deprecated: Functions that expose MonoGenericContext are going away in mono 4.0
@@ -632,11 +602,9 @@ mono_class_get_full (MonoImage *image, guint32 type_token, MonoGenericContext *c

Parameters
-
image the image where the class resides
type_token the token for the class
context the generic context used to evaluate generic instantiations in
Return value
-
The MonoClass that represents type_token in image +
image the image where the class resides
type_token the token for the class
context the generic context used to evaluate generic instantiations in
Return value
+
The MonoClass that represents type_token in image
-
Description
-

@@ -656,12 +624,10 @@ mono_class_get_image (MonoClass *klass)

Return value
-
The image where this class is defined. +
The image where this class is defined.
Description
-

- Use this method to get the MonoImage* where this class came from. -

+

Use this method to get the MonoImage* where this class came from.

@@ -681,17 +647,11 @@ mono_class_get_interfaces (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a Monoclass* on each invocation, or NULL when no more are available. +
klass the MonoClass to act on
Return value
+
a MonoClass* on each invocation, or NULL when no more are available.
Description
-

- This routine is an iterator routine for retrieving the interfaces implemented by this class. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the interfaces implemented by this class.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -711,11 +671,11 @@ mono_class_get_name (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The name of the class. +
klass the MonoClass to act on
Return value
+
The name of the class.
Description
-

+

@@ -735,11 +695,11 @@ mono_class_get_namespace (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The namespace of the class. +
klass the MonoClass to act on
Return value
+
The namespace of the class.
Description
-

+

@@ -759,15 +719,11 @@ mono_class_get_nesting_type (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The container type where this type is nested or NULL if this type is not a nested type. +
klass the MonoClass to act on
Return value
+
The container type where this type is nested or NULL if this type is not a nested type.
Description
-

- Use this function to obtain the class that the provided MonoClass* is nested on. -

- If the return is NULL, this indicates that this class is not nested. -

+

Use this function to obtain the class that the provided MonoClass* is nested on.

If the return is NULL, this indicates that this class is not nested.

@@ -787,11 +743,11 @@ mono_class_get_parent (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The parent class for this class. +
klass the MonoClass to act on
Return value
+
The parent class for this class.
Description
-

+

@@ -811,11 +767,11 @@ mono_class_get_property_token (MonoProperty *prop)

Parameters
-
prop MonoProperty to query
Return value
-
The ECMA token for the specified property. +
prop MonoProperty to query
Return value
+
The ECMA token for the specified property.
Description
-

+

@@ -835,11 +791,11 @@ mono_class_get_rank (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The rank for the array (the number of dimensions). +
klass the MonoClass to act on
Return value
+
The rank for the array (the number of dimensions).
Description
-

+

@@ -859,13 +815,11 @@ mono_class_get_type (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The MonoType from the class. +
klass the MonoClass to act on
Return value
+
The MonoType from the class.
Description
-

- This method returns the internal Type representation for the class. -

+

This method returns the internal MonoType representation for the class.

@@ -885,13 +839,11 @@ mono_class_get_type_token (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The type token for the class. +
klass the MonoClass to act on
Return value
+
The type token for the class.
Description
-

- This method returns type token for the class. -

+

This method returns type token for the class.

@@ -911,11 +863,11 @@ mono_class_implements_interface (MonoClass* klass, MonoClass* iface)

Parameters
-
klass The MonoClass to act on
interface The interface to check if klass implements.
Return value
-
TRUE if klass implements interface. +
klass The MonoClass to act on
interface The interface to check if klass implements.
Return value
+
TRUE if klass implements interface.
Description
-

+

@@ -929,23 +881,42 @@ mono_class_implements_interface (MonoClass* klass, MonoClass* iface)
Syntax
-
mono_class_inflate_generic_method
+
MonoMethod* +mono_class_inflate_generic_method (MonoMethod *method, MonoGenericContext *context) + +

+

Parameters
+
method a generic method
context a generics context
Return value
+
The new instantiated method +
+
Description
+

Instantiate the generic method method using the generics context context.

-
mono_class_inflate_generic_type
+
mono_class_inflate_generic_type

Deprecated: Please use mono_class_inflate_generic_type_checked instead
Syntax
-
mono_class_inflate_generic_type
+
MonoType* +mono_class_inflate_generic_type (MonoType *type, MonoGenericContext *context) + +

+

Parameters
+
type a type
context a generics context
Return value
+
The instantiated type or a copy of type. The returned MonoType is allocated + + on the heap and is owned by the caller. Returns NULL on error.
+
Description
+

If type is a generic type and context is not NULL, instantiate it using the generics context context.

@@ -965,19 +936,12 @@ mono_class_init (MonoClass *klass)

Parameters
-
klass the class to initialize
Description
-

- Compute the instance_size, class_size and other infos that cannot be - computed at mono_class_get() time. Also compute vtable_size if possible. - Returns TRUE on success or FALSE if there was a problem in loading - the type (incorrect assemblies, missing assemblies, methods, etc). - Initializes the following fields in klass: - - all the fields initialized by mono_class_init_sizes () - - has_cctor - - ghcimpl - - inited -

- LOCKING: Acquires the loader lock.

+
klass the class to initialize
Return value
+
TRUE on success or FALSE if there was a problem in loading + + the type (incorrect assemblies, missing assemblies, methods, etc).
+
Description
+

Compute the instance_size, class_size and other infos that cannot be computed at mono_class_get time. Also compute vtable_size if possible. Initializes the following fields in klass: - all the fields initialized by mono_class_init_sizes - has_cctor - ghcimpl - inited

LOCKING: Acquires the loader lock.

@@ -997,13 +961,11 @@ mono_class_instance_size (MonoClass *klass)

Parameters
-
klass a class
Return value
-
The size of an object instance +
klass a class
Return value
+
The size of an object instance
Description
-

- Use to get the size of a class in bytes. -

+

Use to get the size of a class in bytes.

@@ -1023,12 +985,12 @@ mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass)

Parameters
-
klass the class to be assigned to
oklass the source class
Return value
-
TRUE if an instance of object oklass can be assigned to an +
klass the class to be assigned to
oklass the source class
Return value
+
TRUE if an instance of class oklass can be assigned to an - instance of object klass
+ instance of class klass
Description
-

+

@@ -1048,11 +1010,11 @@ mono_class_is_delegate (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
TRUE if the MonoClass represents a System.Delegate. +
klass the MonoClass to act on
Return value
+
TRUE if the MonoClass represents a System.Delegate.
Description
-

+

@@ -1072,13 +1034,11 @@ mono_class_is_enum (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
TRUE if the MonoClass represents an enumeration. +
klass the MonoClass to act on
Return value
+
TRUE if the MonoClass represents an enumeration.
Description
-

- Use this function to determine if the provided MonoClass* represents an enumeration. -

+

Use this function to determine if the provided MonoClass* represents an enumeration.

@@ -1099,20 +1059,8 @@ mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc,

Parameters
-
klass class to probe if it is a subclass of another one
klassc the class we suspect is the base class
check_interfaces whether we should perform interface checks
Description
-

- This method determines whether klass is a subclass of klassc. -

- If the check_interfaces flag is set, then if klassc is an interface - this method return TRUE if the klass implements the interface or - if klass is an interface, if one of its base classes is klass. -

- If check_interfaces is false then, then if klass is not an interface - then it returns TRUE if the klass is a subclass of klassc. -

- if klass is an interface and klassc is System.Object, then this function - return true. -

+
klass class to probe if it is a subclass of another one
klassc the class we suspect is the base class
check_interfaces whether we should perform interface checks
Description
+

This method determines whether klass is a subclass of klassc.

If the check_interfaces flag is set, then if klassc is an interface this method return TRUE if the klass implements the interface or if klass is an interface, if one of its base classes is klass.

If check_interfaces is false, then if klass is not an interface, it returns TRUE if the klass is a subclass of klassc.

if klass is an interface and klassc is System.Object, then this function returns TRUE.

@@ -1132,14 +1080,11 @@ mono_class_is_valuetype (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
TRUE if the MonoClass represents a ValueType, FALSE if it represents a reference type. +
klass the MonoClass to act on
Return value
+
TRUE if the MonoClass represents a ValueType, FALSE if it represents a reference type.
Description
-

- Use this method to determine if the provided MonoClass* represents a value type, - or a reference type. -

+

Use this method to determine if the provided MonoClass* represents a value type, or a reference type.

@@ -1159,13 +1104,11 @@ mono_class_min_align (MonoClass *klass)

Parameters
-
klass a class
Return value
-
minimum alignment requirements +
klass a class
Return value
+
minimum alignment requirements
Description
-

- Use to get the computed minimum alignment requirements for the specified class. -

+

Use to get the computed minimum alignment requirements for the specified class.

@@ -1179,7 +1122,10 @@ mono_class_min_align (MonoClass *klass)
Syntax
-
mono_class_name_from_token
+
char* +mono_class_name_from_token (MonoImage *image, guint32 type_token) + +

@@ -1200,11 +1146,11 @@ mono_class_num_events (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The number of events in the class. +
klass the MonoClass to act on
Return value
+
The number of events in the class.
Description
-

+

@@ -1224,11 +1170,11 @@ mono_class_num_fields (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The number of static and instance fields in the class. +
klass the MonoClass to act on
Return value
+
The number of static and instance fields in the class.
Description
-

+

@@ -1248,11 +1194,11 @@ mono_class_num_methods (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The number of methods in the class. +
klass the MonoClass to act on
Return value
+
The number of methods in the class.
Description
-

+

@@ -1272,11 +1218,11 @@ mono_class_num_properties (MonoClass *klass)

Parameters
-
klass the MonoClass to act on
Return value
-
The number of properties in the class. +
klass the MonoClass to act on
Return value
+
The number of properties in the class.
Description
-

+

@@ -1296,14 +1242,11 @@ mono_class_value_size (MonoClass *klass, guint32 *align)

Parameters
-
klass a class
Return value
-
the size of a value of kind klass +
klass a class
Return value
+
the size of a value of kind klass
Description
-

- This function is used for value types, and return the - space and the alignment to store that kind of value object. -

+

This function is used for value types, and return the space and the alignment to store that kind of value object.

@@ -1323,11 +1266,8 @@ mono_class_vtable (MonoDomain *domain, MonoClass *klass)

Parameters
-
domain the application domain
class the class to initialize
Description
-

- VTables are domain specific because we create domain specific code, and - they contain the domain specific static class data. - On failure, NULL is returned, and class->exception_type is set.

+
domain the application domain
class the class to initialize
Description
+
VTables are domain specific because we create domain specific code, and they contain the domain specific static class data. On failure, NULL is returned, and class->exception_type is set.
@@ -1351,17 +1291,11 @@ mono_class_get_fields (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a MonoClassField* on each iteration, or NULL when no more fields are available. +
klass the MonoClass to act on
Return value
+
a MonoClassField* on each iteration, or NULL when no more fields are available.
Description
-

- This routine is an iterator routine for retrieving the fields in a class. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the fields in a class.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -1381,13 +1315,11 @@ mono_class_get_field_from_name (MonoClass *klass, const char *name)

Parameters
-
klass the class to lookup the field.
name the field name
Return value
-
The MonoClassField pointer of the named field or NULL +
klass the class to lookup the field.
name the field name
Return value
+
The MonoClassField pointer of the named field or NULL
Description
-

- Search the class klass and it's parents for a field with the name name. -

+

Search the class klass and its parents for a field with the name name.

@@ -1407,17 +1339,11 @@ mono_class_get_methods (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a MonoMethod on each iteration or NULL when no more methods are available. +
klass the MonoClass to act on
Return value
+
a MonoMethod on each iteration or NULL when no more methods are available.
Description
-

- This routine is an iterator routine for retrieving the fields in a class. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the fields in a class.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -1437,10 +1363,8 @@ mono_class_get_method_from_name (MonoClass *klass, const char *name, int param_c

Parameters
-
klass where to look for the method
name name of the method
param_count number of parameters. -1 for any number.
Description
-

- Obtains a MonoMethod with a given name and number of parameters. - It only works if there are no multiple signatures for any given method name.

+
klass where to look for the method
name name of the method
param_count number of parameters. -1 for any number.
Description
+

Obtains a MonoMethod with a given name and number of parameters. It only works if there are no multiple signatures for any given method name.

@@ -1460,10 +1384,8 @@ mono_class_get_method_from_name_flags (MonoClass *klass, const char *name, int p

Parameters
-
klass where to look for the method
name_space name of the method
param_count number of parameters. -1 for any number.
flags flags which must be set in the method
Description
-

- Obtains a MonoMethod with a given name and number of parameters. - It only works if there are no multiple signatures for any given method name.

+
klass where to look for the method
name_space name of the method
param_count number of parameters. -1 for any number.
flags flags which must be set in the method
Description
+

Obtains a MonoMethod with a given name and number of parameters. It only works if there are no multiple signatures for any given method name.

@@ -1483,18 +1405,11 @@ mono_class_get_nested_types (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a Monoclass* on each invocation, or NULL when no more are available. +
klass the MonoClass to act on
Return value
+
a Monoclass* on each invocation, or NULL when no more are available.
Description
-

- This routine is an iterator routine for retrieving the nested types of a class. - This works only if klass is non-generic, or a generic type definition. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the nested types of a class. This works only if klass is non-generic, or a generic type definition.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -1514,17 +1429,11 @@ mono_class_get_properties (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a MonoProperty* on each invocation, or NULL when no more are available. +
klass the MonoClass to act on
Return value
+
a MonoProperty* on each invocation, or NULL when no more are available.
Description
-

- This routine is an iterator routine for retrieving the properties in a class. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the properties in a class.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -1544,13 +1453,12 @@ mono_class_get_property_from_name (MonoClass *klass, const char *name)

Parameters
-
klass a class
name name of the property to lookup in the specified class
Return value
-
the MonoProperty with the given name, or NULL if the property +
klass a class
name name of the property to lookup in the specified class
Return value
+
the MonoProperty with the given name, or NULL if the property does not exist on the klass.
Description
-

- Use this method to lookup a property in a class

+

Use this method to lookup a property in a class

@@ -1570,17 +1478,11 @@ mono_class_get_events (MonoClass* klass, gpointer *iter)

Parameters
-
klass the MonoClass to act on
Return value
-
a MonoEvent* on each invocation, or NULL when no more are available. +
klass the MonoClass to act on
Return value
+
a MonoEvent* on each invocation, or NULL when no more are available.
Description
-

- This routine is an iterator routine for retrieving the properties in a class. -

- You must pass a gpointer that points to zero and is treated as an opaque handle to - iterate over all of the elements. When no more values are - available, the return value is NULL. -

+

This routine is an iterator routine for retrieving the properties in a class.

You must pass a gpointer that points to zero and is treated as an opaque handle to iterate over all of the elements. When no more values are available, the return value is NULL.

@@ -1604,12 +1506,12 @@ mono_field_get_data (MonoClassField *field)

Parameters
-
field the MonoClassField to act on
Return value
-
A pointer to the metadata constant value or to the field +
field the MonoClassField to act on
Return value
+
A pointer to the metadata constant value or to the field data if it has an RVA flag.
Description
-

+

@@ -1629,11 +1531,11 @@ mono_field_get_offset (MonoClassField *field)

Parameters
-
field the MonoClassField to act on
Return value
-
The field offset. +
field the MonoClassField to act on
Return value
+
The field offset.
Description
-

+

@@ -1653,11 +1555,9 @@ mono_field_full_name (MonoClassField *field)

Parameters
-
field field to retrieve information for
Return value
-
the full name for the field, made up of the namespace, type name and the field name. +
field field to retrieve information for
Return value
+
the full name for the field, made up of the namespace, type name and the field name.
-
Description
-

@@ -1680,14 +1580,12 @@ mono_method_can_access_field (MonoMethod *method, MonoClassField *field)

Parameters
-
method Method that will attempt to access the field
field the field to access
Return value
-
TRUE if the given method is allowed to access the field while following +
method Method that will attempt to access the field
field the field to access
Return value
+
TRUE if the given method is allowed to access the field while following the accessibility rules of the CLI.
Description
-

- Used to determine if a method is allowed to access the specified field. -

+

Used to determine if a method is allowed to access the specified field.

@@ -1707,17 +1605,12 @@ mono_method_can_access_method (MonoMethod *method, MonoMethod *called)

Parameters
-
method Method that will attempt to access the other method
called the method that we want to probe for accessibility.
Return value
-
TRUE if the given method is allowed to invoke the called while following +
method Method that will attempt to access the other method
called the method that we want to probe for accessibility.
Return value
+
TRUE if the given method is allowed to invoke the called while following the accessibility rules of the CLI.
Description
-

- Used to determine if the method is allowed to access the specified called method. -

+

Used to determine if the method is allowed to access the specified called method.

- - - diff --git a/docs/deploy/mono-api-counters.html b/docs/deploy/mono-api-counters.html index 061ac5b815..d4894c3f93 100644 --- a/docs/deploy/mono-api-counters.html +++ b/docs/deploy/mono-api-counters.html @@ -243,11 +243,8 @@ mono_counters_dump (int section_mask, FILE *outfile)

Parameters
-
section_mask The sections to dump counters for
outfile a FILE to dump the results to
Description
-

- Displays the counts of all the enabled counters registered. - To filter by variance, you can OR one or more variance with the specific section you want. - Use MONO_COUNTER_SECTION_MASK to dump all categories of a specific variance.

+
section_mask The sections to dump counters for
outfile a FILE to dump the results to
Description
+
Displays the counts of all the enabled counters registered. To filter by variance, you can OR one or more variance with the specific section you want. Use MONO_COUNTER_SECTION_MASK to dump all categories of a specific variance.
@@ -267,11 +264,7 @@ mono_counters_enable (int section_mask)

Parameters
-
section_mask a mask listing the sections that will be displayed
Description
-

- This is used to track which counters will be displayed.

+
sectionmask a mask listing the sections that will be displayed
Description
+
This is used to track which counters will be displayed.
- - - diff --git a/docs/deploy/mono-api-debug.html b/docs/deploy/mono-api-debug.html index 5eb1e75f84..71fa231a7f 100644 --- a/docs/deploy/mono-api-debug.html +++ b/docs/deploy/mono-api-debug.html @@ -234,7 +234,11 @@
Syntax
-
mono_debug_open_mono_symbols
+
MonoSymbolFile* +mono_debug_open_mono_symbols (MonoDebugHandle *handle, const uint8_t *raw_contents, + int size, gboolean in_the_debugger) + +

@@ -249,8 +253,13 @@

Syntax
-
mono_debug_symfile_free_location
+
void +mono_debug_symfile_free_location (MonoDebugSourceLocation *location) + +

+

Description
+

Free a MonoDebugSourceLocation returned by mono_debug_symfile_lookup_location

@@ -264,7 +273,10 @@
Syntax
-
mono_debug_symfile_is_loaded
+
mono_bool +mono_debug_symfile_is_loaded (MonoSymbolFile *symfile) + +

@@ -279,8 +291,13 @@

Syntax
-
mono_debug_symfile_lookup_locals
+
MonoDebugLocalsInfo* +mono_debug_symfile_lookup_locals (MonoDebugMethodInfo *minfo) + +

+

Description
+

Return information about the local variables of minfo from the symbol file. Return NULL if no information can be found. The result should be freed using mono_debug_symfile_free_locals.

@@ -300,13 +317,8 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)

Parameters
-
minfo A `MonoDebugMethodInfo' which can be retrieved by
Description
-
mono_debug_lookup_method(). - offset: IL offset within the corresponding method's CIL code. -

- This function is similar to mono_debug_lookup_location(), but we - already looked up the method and also already did the - `native address -> IL offset' mapping.

+
minfo A MonoDebugMethodInfo which can be retrieved by mono_debug_lookup_method.
offset IL offset within the corresponding method's CIL code.
Description
+

This function is similar to mono_debug_lookup_location, but we already looked up the method and also already did the native address -> IL offset mapping.

@@ -320,7 +332,10 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)
Syntax
-
mono_debug_symfile_lookup_method
+
MonoDebugMethodInfo* +mono_debug_symfile_lookup_method (MonoDebugHandle *handle, MonoMethod *method) + +

@@ -338,7 +353,10 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)

Syntax
-
mono_debug_add_delegate_trampoline
+
void +mono_debug_add_delegate_trampoline (gpointer code, int size) + +

@@ -353,7 +371,10 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)

Syntax
-
mono_debug_close_image
+
void +mono_debug_close_image (MonoImage *image) + +

@@ -368,7 +389,10 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)

Syntax
-
mono_debug_domain_create
+
void +mono_debug_domain_create (MonoDomain *domain) + +

@@ -404,8 +428,7 @@ mono_debug_enabled (void)

Description
-

- Returns true is debug information is enabled. This doesn't relate if a debugger is present or not.

+

Returns true is debug information is enabled. This doesn't relate if a debugger is present or not.

@@ -440,9 +463,8 @@ mono_debug_free_source_location (MonoDebugSourceLocation *location)

Parameters
-
location A `MonoDebugSourceLocation'.
Description
-

- Frees the location.

+
location A MonoDebugSourceLocation
Description
+
Frees the location.
@@ -477,10 +499,7 @@ mono_debug_lookup_method (MonoMethod *method)

Description
-

- Lookup symbol file information for the method method. The returned - `MonoDebugMethodInfo' is a private structure, but it can be passed to - mono_debug_symfile_lookup_location().

+

Lookup symbol file information for the method method. The returned MonoDebugMethodInfo is a private structure, but it can be passed to mono_debug_symfile_lookup_location.

@@ -515,14 +534,8 @@ mono_debug_lookup_source_location (MonoMethod *method, guint32 address, MonoDoma

Parameters
-
address Native offset within the method's machine code.
Description
-

- Lookup the source code corresponding to the machine instruction located at - native offset address within method. -

- The returned `MonoDebugSourceLocation' contains both file / line number - information and the corresponding IL offset. It must be freed by - mono_debug_free_source_location().

+
address Native offset within the method's machine code.
Description
+
Lookup the source code corresponding to the machine instruction located at native offset address within method. The returned MonoDebugSourceLocation contains both file / line number information and the corresponding IL offset. It must be freed by mono_debug_free_source_location.
@@ -557,10 +570,8 @@ mono_debug_print_stack_frame (MonoMethod *method, guint32 native_offset, MonoDom

Parameters
-
native_offset Native offset within the method's machine code.
Description
-

- Conventient wrapper around mono_debug_lookup_source_location() which can be - used if you only want to use the location to print a stack frame.

+
native_offset Native offset within the method's machine code.
Description
+
Conventient wrapper around mono_debug_lookup_source_location which can be used if you only want to use the location to print a stack frame.
@@ -595,9 +606,7 @@ mono_debug_il_offset_from_address (MonoMethod *method, MonoDomain *domain, guint

Description
-

- Compute the IL offset corresponding to NATIVE_OFFSET inside the native - code of METHOD in DOMAIN.

+

Compute the IL offset corresponding to native_offset inside the native code of method in domain.

@@ -611,7 +620,10 @@ mono_debug_il_offset_from_address (MonoMethod *method, MonoDomain *domain, guint
Syntax
-
mono_debug_add_method
+
MonoDebugMethodAddress* +mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDomain *domain) + +

@@ -626,10 +638,10 @@ mono_debug_il_offset_from_address (MonoMethod *method, MonoDomain *domain, guint

Syntax
-
mono_debug_close_mono_symbol_file
+
void +mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile) + +

- - - diff --git a/docs/deploy/mono-api-domains.html b/docs/deploy/mono-api-domains.html index 603a315058..dc070b7418 100644 --- a/docs/deploy/mono-api-domains.html +++ b/docs/deploy/mono-api-domains.html @@ -202,43 +202,6 @@ typedef struct _MonoDomain MonoDomain; /* Represents System.Runtime.Remoting.Contexts.Context */ typedef struct _MonoAppContext MonoAppContext -MonoAssembly* mono_domain_assembly_open (MonoDomain *domain, - const char *name); -MonoDomain* mono_domain_create (void); -MonoDomain* mono_domain_create_appdomain (char *friendly_name, - char *configuration_file); -gboolean mono_domain_finalize (MonoDomain *domain, - guint32 timeout) ; -void mono_domain_foreach (MonoDomainFunc func, - gpointer user_data); -void mono_domain_free (MonoDomain *domain, - gboolean force); - mono_domain_from_appdomain -MonoDomain* mono_domain_get_by_id (gint32 domainid) ; - mono_domain_get_friendly_name - mono_domain_get_id -MonoDomain* mono_domain_get (); -gboolean mono_domain_has_type_resolve (MonoDomain *domain); - mono_domain_is_unloading -gboolean mono_domain_owns_vtable_slot (MonoDomain *domain, - gpointer vtable_slot); -void mono_domain_set_config (MonoDomain *domain, - const char *base_dir, - const char *config_file_name); -void mono_domain_set_internal (MonoDomain *domain); -gboolean mono_domain_set (MonoDomain *domain, - gboolean force); -MonoReflectionAssembly* mono_domain_try_type_resolve (MonoDomain *domain, - char *name, - MonoObject *tb); - mono_domain_try_unload - mono_domain_unload -void mono_context_init (MonoDomain *domain); -MonoAppContext* mono_context_get (void); -gint32 mono_context_get_domain_id (MonoAppContext *context); -gint32 mono_context_get_id (MonoAppContext *context); - mono_context_set - mono_context_get_desc @@ -271,10 +234,7 @@ mono_domain_assembly_open (MonoDomain *domain, const char *name)

Parameters
-
domain the application domain
name file name of the assembly
Description
-

- fixme: maybe we should integrate this with mono_assembly_open ??

- +
domain the application domain
name file name of the assembly
@@ -293,26 +253,11 @@ mono_domain_create (void)

Return value
-
New initialized MonoDomain, with no configuration or assemblies +
New initialized MonoDomain, with no configuration or assemblies loaded into it.
Description
-

- Creates a new application domain, the unmanaged representation - of the actual domain. Usually you will want to create the -

- Application domains provide an isolation facilty for assemblies. You - can load assemblies and execute code in them that will not be visible - to other application domains. This is a runtime-based virtualization - technology. -

- It is possible to unload domains, which unloads the assemblies and - data that was allocated in that domain. -

- When a domain is created a mempool is allocated for domain-specific - structures, along a dedicated code manager to hold code that is - associated with the domain. -

+

Creates a new application domain, the unmanaged representation of the actual domain.

Application domains provide an isolation facilty for assemblies. You can load assemblies and execute code in them that will not be visible to other application domains. This is a runtime-based virtualization technology.

It is possible to unload domains, which unloads the assemblies and data that was allocated in that domain.

When a domain is created a mempool is allocated for domain-specific structures, along a dedicated code manager to hold code that is associated with the domain.

@@ -332,9 +277,9 @@ mono_domain_create_appdomain (char *friendly_name, char *configuration_file)

Parameters
-
friendly_name The friendly name of the appdomain to create
configuration_file The configuration file to initialize the appdomain with
Description
-

- Returns a MonoDomain initialized with the appdomain

+
friendly_name The friendly name of the appdomain to create
configuration_file The configuration file to initialize the appdomain with
Return value
+
a MonoDomain initialized with the appdomain +
@@ -348,21 +293,17 @@ mono_domain_create_appdomain (char *friendly_name, char *configuration_file)
Syntax
-
-gboolean +
gboolean mono_domain_finalize (MonoDomain *domain, guint32 timeout)

Parameters
-
domain the domain to finalize
timeout msects to wait for the finalization to complete, -1 to wait indefinitely
Return value
-
TRUE if succeeded, FALSE if there was a timeout +
domain the domain to finalize
timeout msecs to wait for the finalization to complete, -1 to wait indefinitely
Return value
+
TRUE if succeeded, FALSE if there was a timeout
Description
-

- Request finalization of all finalizable objects inside domain. Wait - timeout msecs for the finalization to complete. -

+

Request finalization of all finalizable objects inside domain. Wait timeout msecs for the finalization to complete.

@@ -382,12 +323,8 @@ mono_domain_foreach (MonoDomainFunc func, gpointer user_data)

Parameters
-
func function to invoke with the domain data
user_data user-defined pointer that is passed to the supplied func fo reach domain
Description
-

- Use this method to safely iterate over all the loaded application - domains in the current runtime. The provided func is invoked with a - pointer to the MonoDomain and is given the value of the user_data - parameter which can be used to pass state to your called routine.

+
func function to invoke with the domain data
user_data user-defined pointer that is passed to the supplied func fo reach domain
Description
+

Use this method to safely iterate over all the loaded application domains in the current runtime. The provided func is invoked with a pointer to the MonoDomain and is given the value of the user_data parameter which can be used to pass state to your called routine.

@@ -407,11 +344,8 @@ mono_domain_free (MonoDomain *domain, gboolean force)

Parameters
-
domain the domain to release
force if true, it allows the root domain to be released (used at shutdown only).
Description
-

- This releases the resources associated with the specific domain. - This is a low-level function that is invoked by the AppDomain infrastructure - when necessary.

+
domain the domain to release
force if TRUE, it allows the root domain to be released (used at shutdown only).
Description
+

This releases the resources associated with the specific domain. This is a low-level function that is invoked by the AppDomain infrastructure when necessary.

@@ -425,7 +359,10 @@ mono_domain_free (MonoDomain *domain, gboolean force)
Syntax
-
mono_domain_from_appdomain
+
MonoDomain* +mono_domain_from_appdomain (MonoAppDomain *appdomain_raw) + +

@@ -446,11 +383,9 @@ mono_domain_get_by_id (gint32 domainid)

Parameters
-
domainid the ID
Return value
-
the domain for a specific domain id. +
domainid the ID
Return value
+
the domain for a specific domain id.
-
Description
-

@@ -464,8 +399,16 @@ mono_domain_get_by_id (gint32 domainid)
Syntax
-
mono_domain_get_friendly_name
+
const char * +mono_domain_get_friendly_name (MonoDomain *domain) + +

+

Return value
+
The friendly name of domain. Can be NULL if not yet set. +
+
Description
+

The returned string's lifetime is the same as domain's. Consider copying it if you need to store it somewhere.

@@ -479,8 +422,16 @@ mono_domain_get_by_id (gint32 domainid)
Syntax
-
mono_domain_get_id
+
gint32 +mono_domain_get_id (MonoDomain *domain) + +

+

Return value
+
The unique ID for domain. +
+
Description
+

A domain ID is guaranteed to be unique for as long as the domain using it is alive. It may be reused later once the domain has been unloaded.

@@ -500,14 +451,10 @@ mono_domain_get ()

Return value
-
the current domain +
the current domain
Description
-

- This method returns the value of the current MonoDomain that this thread - and code are running under. To obtain the root domain use - mono_get_root_domain() API. -

+

This method returns the value of the current MonoDomain that this thread and code are running under. To obtain the root domain use mono_get_root_domain API.

@@ -527,12 +474,11 @@ mono_domain_has_type_resolve (MonoDomain *domain)

Parameters
-
domain application domains being looked up
Return value
-
TRUE if the AppDomain.TypeResolve field has been - - set.
+
domain application domain being looked up
Return value
+
TRUE if the AppDomain.TypeResolve field has been set. +
Description
-

+

@@ -546,7 +492,10 @@ mono_domain_has_type_resolve (MonoDomain *domain)
Syntax
-
mono_domain_is_unloading
+
gboolean +mono_domain_is_unloading (MonoDomain *domain) + +

@@ -566,9 +515,9 @@ mono_domain_owns_vtable_slot (MonoDomain *domain, gpointer vtable_slot)

-

Description
-

- Returns whenever VTABLE_SLOT is inside a vtable which belongs to DOMAIN.

+
Return value
+
Whether vtable_slot is inside a vtable which belongs to domain. +
@@ -588,13 +537,8 @@ mono_domain_set_config (MonoDomain *domain, const char *base_dir, const char *co

Parameters
-
domain MonoDomain initialized with the appdomain we want to change
base_dir new base directory for the appdomain
config_file_name path to the new configuration for the app domain
Description
-

- Used to set the system configuration for an appdomain -

- Without using this, embedded builds will get 'System.Configuration.ConfigurationErrorsException: - Error Initializing the configuration system. ---> System.ArgumentException: - The 'ExeConfigFilename' argument cannot be null.' for some managed calls.

+
domain MonoDomain initialized with the appdomain we want to change
base_dir new base directory for the appdomain
config_file_name path to the new configuration for the app domain
Description
+

Used to set the system configuration for an appdomain

Without using this, embedded builds will get 'System.Configuration.ConfigurationErrorsException: Error Initializing the configuration system. ---> System.ArgumentException: The 'ExeConfigFilename' argument cannot be null.' for some managed calls.

@@ -614,9 +558,8 @@ mono_domain_set_internal (MonoDomain *domain)

Parameters
-
domain the new domain
Description
-

- Sets the current domain to domain.

+
domain the new domain
Description
+

Sets the current domain to domain.

@@ -636,16 +579,11 @@ mono_domain_set (MonoDomain *domain, gboolean force)

Parameters
-
domain domain
force force setting.
Return value
-
- - TRUE on success; - FALSE if the domain is unloaded
+
domain domain
force force setting.
Return value
+
TRUE on success; FALSE if the domain is unloaded +
Description
-

- Set the current appdomain to domain. If force is set, set it even - if it is being unloaded. -

+

Set the current appdomain to domain. If force is set, set it even if it is being unloaded.

@@ -665,16 +603,11 @@ mono_domain_try_type_resolve (MonoDomain *domain, char *name, MonoObject *tb)

Parameters
-
domain application domainwhere the name where the type is going to be resolved
name the name of the type to resolve or NULL.
tb A System.Reflection.Emit.TypeBuilder, used if name is NULL.
Return value
-
A MonoReflectionAssembly or NULL if not found +
domain application domainwhere the name where the type is going to be resolved
name the name of the type to resolve or NULL.
tb A System.Reflection.Emit.TypeBuilder, used if name is NULL.
Return value
+
A MonoReflectionAssembly or NULL if not found
Description
-

- This routine invokes the internal System.AppDomain.DoTypeResolve and returns - the assembly that matches name. -

- If name is null, the value of ((TypeBuilder)tb).FullName is used instead -

+

This routine invokes the internal System.AppDomain.DoTypeResolve and returns the assembly that matches name.

If name is null, the value of ((TypeBuilder)tb).FullName is used instead

@@ -703,8 +636,14 @@ mono_domain_try_type_resolve (MonoDomain *domain, char *name, MonoObject *tb)
Syntax
-
mono_domain_unload
+
void +mono_domain_try_unload (MonoDomain *domain, MonoObject **exc) + +

+

Parameters
+
domain The domain to unload
exc Exception information
Description
+

Unloads an appdomain. Follows the process outlined in: http://blogs.gotdotnet.com/cbrumme

If doing things the 'right' way is too hard or complex, we do it the 'simple' way, which means do everything needed to avoid crashes and memory leaks, but not much else.

It is required to pass a valid reference to the exc argument, upon return from this function *exc will be set to the exception thrown, if any.

If this method is not called from an icall (embedded scenario for instance), it must not be called with any managed frames on the stack, since the unload process could end up trying to abort the current thread.

@@ -727,9 +666,8 @@ mono_context_init (MonoDomain *domain)

Parameters
-
domain The domain where the System.Runtime.Remoting.Context.Context is initialized
Description
-

- Initializes the domain's default System.Runtime.Remoting's Context.

+
domain The domain where the System.Runtime.Remoting.Context.Context is initialized
Description
+
Initializes the domain's default System.Runtime.Remoting 's Context.
@@ -749,10 +687,10 @@ mono_context_get (void)

Return value
-
the current Mono Application Context. +
the current Mono Application Context.
Description
-

+

@@ -772,11 +710,9 @@ mono_context_get_domain_id (MonoAppContext *context)

Parameters
-
context the context to operate on.
Return value
-
The ID of the domain that context was created in. +
context the context to operate on.
Return value
+
The ID of the domain that context was created in.
-
Description
-

@@ -796,14 +732,11 @@ mono_context_get_id (MonoAppContext *context)

Parameters
-
context the context to operate on.
Return value
-
The unique ID for context. +
context the context to operate on.
Return value
+
The unique ID for context.
Description
-

- Context IDs are guaranteed to be unique for the duration of a Mono - process; they are never reused. -

+

Context IDs are guaranteed to be unique for the duration of a Mono process; they are never reused.

@@ -817,10 +750,10 @@ mono_context_get_id (MonoAppContext *context)
Syntax
-
mono_context_set
+
void +mono_context_set (MonoAppContext * new_context) + +

- - - diff --git a/docs/deploy/mono-api-dynamic-codegen.html b/docs/deploy/mono-api-dynamic-codegen.html index 75e4300ea4..df445ae594 100644 --- a/docs/deploy/mono-api-dynamic-codegen.html +++ b/docs/deploy/mono-api-dynamic-codegen.html @@ -276,7 +276,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_new
+
MonoMethodBuilder* +mono_mb_new (MonoClass *klass, const char *name, MonoWrapperType type) + +

@@ -326,7 +329,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_add_to_local
+
void +mono_mb_emit_add_to_local (MonoMethodBuilder *mb, guint16 local, gint32 incr) + +

@@ -341,7 +347,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_branch
+
guint32 +mono_mb_emit_branch (MonoMethodBuilder *mb, guint8 op) + +

@@ -356,7 +365,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_byte
+
void +mono_mb_emit_byte (MonoMethodBuilder *mb, guint8 op) + +

@@ -371,7 +383,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_exception
+
void +mono_mb_emit_exception (MonoMethodBuilder *mb, const char *exc_name, const char *msg) + +

@@ -386,7 +401,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_i2
+
void +mono_mb_emit_i2 (MonoMethodBuilder *mb, gint16 data) + +

@@ -401,7 +419,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_i4
+
void +mono_mb_emit_i4 (MonoMethodBuilder *mb, gint32 data) + +

@@ -416,7 +437,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_icon
+
void +mono_mb_emit_icon (MonoMethodBuilder *mb, gint32 value) + +

@@ -431,7 +455,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldarg_addr
+
void +mono_mb_emit_ldarg_addr (MonoMethodBuilder *mb, guint argnum) + +

@@ -446,7 +473,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldarg
+
void +mono_mb_emit_ldarg (MonoMethodBuilder *mb, guint argnum) + +

@@ -461,7 +491,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldflda
+
void +mono_mb_emit_ldflda (MonoMethodBuilder *mb, gint32 offset) + +

@@ -476,7 +509,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldloc_addr
+
void +mono_mb_emit_ldloc_addr (MonoMethodBuilder *mb, guint locnum) + +

@@ -491,7 +527,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldloc
+
void +mono_mb_emit_ldloc (MonoMethodBuilder *mb, guint num) + +

@@ -506,7 +545,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_ldstr
+
void +mono_mb_emit_ldstr (MonoMethodBuilder *mb, char *str) + +

@@ -521,7 +563,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_managed_call
+
void +mono_mb_emit_managed_call (MonoMethodBuilder *mb, MonoMethod *method, MonoMethodSignature *opt_sig) + +

@@ -536,7 +581,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_native_call
+
void +mono_mb_emit_native_call (MonoMethodBuilder *mb, MonoMethodSignature *sig, gpointer func) + +

@@ -551,7 +599,10 @@ MonoMethod *adder ()

Syntax
-
mono_mb_emit_stloc
+
void +mono_mb_emit_stloc (MonoMethodBuilder *mb, guint num) + +

@@ -574,12 +625,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Return value
-
the newly created method. - -

+
the newly created method. +
Description
-

- Create a MonoMethod from this method builder.

+
Create a MonoMethod from this method builder.
@@ -593,7 +642,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
Syntax
-
mono_mb_add_data
+
guint32 +mono_mb_add_data (MonoMethodBuilder *mb, gpointer data) + +

@@ -608,7 +660,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Syntax
-
mono_mb_add_local
+
int +mono_mb_add_local (MonoMethodBuilder *mb, MonoType *type) + +

@@ -623,7 +678,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Syntax
-
mono_mb_free
+
void +mono_mb_free (MonoMethodBuilder *mb) + +

@@ -640,7 +698,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Syntax
-
mono_mb_patch_addr
+
void +mono_mb_patch_addr (MonoMethodBuilder *mb, int pos, int value) + +

@@ -655,7 +716,10 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Syntax
-
mono_mb_patch_addr_s
+
void +mono_mb_patch_addr_s (MonoMethodBuilder *mb, int pos, gint8 value) + +

@@ -672,8 +736,17 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in

Syntax
-
mono_metadata_signature_alloc
+
MonoMethodSignature* +mono_metadata_signature_alloc (MonoImage *m, guint32 nparams) + +

+

Parameters
+
image metadata context
nparams number of parameters in the signature
Return value
+
the new MonoMethodSignature structure. +
+
Description
+

Allocate a MonoMethodSignature structure with the specified number of params. The return type and the params types need to be filled later. This is a Mono runtime internal function.

LOCKING: Assumes the loader lock is held.

@@ -687,10 +760,16 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
Syntax
-
mono_metadata_signature_dup
+
MonoMethodSignature* +mono_metadata_signature_dup (MonoMethodSignature *sig) + +

+

Parameters
+
sig method signature
Return value
+
the new MonoMethodSignature structure. +
+
Description
+

Duplicate an existing MonoMethodSignature so it can be modified. This is a Mono runtime internal function.

- - - diff --git a/docs/deploy/mono-api-embedding.html b/docs/deploy/mono-api-embedding.html index 6a43aa99c0..79e20fa403 100644 --- a/docs/deploy/mono-api-embedding.html +++ b/docs/deploy/mono-api-embedding.html @@ -258,7 +258,10 @@ getMessage ()
Syntax
-
mono_jit_init
+
MonoDomain* +mono_jit_init (const char *file) + +

@@ -273,8 +276,13 @@ getMessage ()

Syntax
-
mono_jit_parse_options
+
void +mono_jit_parse_options (int argc, char * argv[]) + +

+

Description
+

Process the command line options in argv as done by the runtime executable. This should be called before mono_jit_init.

@@ -294,9 +302,8 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[

Parameters
-
assembly reference to an assembly
argc argument count
argv argument vector
Description
-

- Start execution of a program.

+
assembly reference to an assembly
argc argument count
argv argument vector
Description
+
Start execution of a program.
@@ -316,27 +323,8 @@ mono_set_dirs (const char *assembly_dir, const char *config_dir)

Parameters
-
assembly_dir the base directory for assemblies
config_dir the base directory for configuration files
Description
-

- This routine is used internally and by developers embedding - the runtime into their own applications. -

- There are a number of cases to consider: Mono as a system-installed - package that is available on the location preconfigured or Mono in - a relocated location. -

- If you are using a system-installed Mono, you can pass NULL - to both parameters. If you are not, you should compute both - directory values and call this routine. -

- The values for a given PREFIX are: -

- assembly_dir: PREFIX/lib - config_dir: PREFIX/etc -

- Notice that embedders that use Mono in a relocated way must - compute the location at runtime, as they will be in control - of where Mono is installed.

+
assembly_dir the base directory for assemblies
config_dir the base directory for configuration files
Description
+

This routine is used internally and by developers embedding the runtime into their own applications.

There are a number of cases to consider: Mono as a system-installed package that is available on the location preconfigured or Mono in a relocated location.

If you are using a system-installed Mono, you can pass NULL to both parameters. If you are not, you should compute both directory values and call this routine.

The values for a given PREFIX are:

assembly_dir: PREFIX/lib config_dir: PREFIX/etc

Notice that embedders that use Mono in a relocated way must compute the location at runtime, as they will be in control of where Mono is installed.

@@ -350,7 +338,10 @@ mono_set_dirs (const char *assembly_dir, const char *config_dir)
Syntax
-
mono_parse_default_optimizations
+
int +mono_parse_default_optimizations (const char* p) + +

@@ -371,10 +362,8 @@ mono_runtime_set_main_args (int argc, char* argv[])

Parameters
-
argc number of arguments from the command line
argv array of strings from the command line
Description
-

- Set the command line arguments from an embedding application that doesn't otherwise call - mono_runtime_run_main ().

+
argc number of arguments from the command line
argv array of strings from the command line
Description
+
Set the command line arguments from an embedding application that doesn't otherwise call mono_runtime_run_main.
@@ -388,7 +377,10 @@ mono_runtime_set_main_args (int argc, char* argv[])
Syntax
-
mono_jit_cleanup
+
void +mono_jit_cleanup (MonoDomain *domain) + +

@@ -409,14 +401,11 @@ mono_jit_set_trace_options (const char* options)

Parameters
-
options string representing the trace options
Return value
-
#TRUE if the options where parsed and set correctly, #FALSE otherwise. +
options string representing the trace options
Return value
+
TRUE if the options were parsed and set correctly, FALSE otherwise.
Description
-

- Set the options of the tracing engine. This function can be called before initializing - the mono runtime. See the --trace mono(1) manpage for the options format. -

+
Set the options of the tracing engine. This function can be called before initializing the mono runtime. See the --trace mono(1) manpage for the options format.

@@ -455,38 +444,8 @@ mono_add_internal_call (const char *name, gconstpointer method)

Parameters
-
name method specification to surface to the managed world
method pointer to a C method to invoke when the method is called
Description
-

- This method surfaces the C function pointed by method as a method - that has been surfaced in managed code with the method specified in - name as an internal call. -

- Internal calls are surfaced to all app domains loaded and they are - accessibly by a type with the specified name. -

- You must provide a fully qualified type name, that is namespaces - and type name, followed by a colon and the method name, with an - optional signature to bind. -

- For example, the following are all valid declarations: -

- "MyApp.Services.ScriptService:Accelerate" - "MyApp.Services.ScriptService:Slowdown(int,bool)" -

- You use method parameters in cases where there might be more than - one surface method to managed code. That way you can register different - internal calls for different method overloads. -

- The internal calls are invoked with no marshalling. This means that .NET - types like System.String are exposed as `MonoString *` parameters. This is - different than the way that strings are surfaced in P/Invoke. -

- For more information on how the parameters are marshalled, see the - Mono Embedding - page. -

- See the Method Description - reference for more information on the format of method descriptions.

+
name method specification to surface to the managed world
method pointer to a C method to invoke when the method is called
Description
+

This method surfaces the C function pointed by method as a method that has been surfaced in managed code with the method specified in name as an internal call.

Internal calls are surfaced to all app domains loaded and they are accessibly by a type with the specified name.

You must provide a fully qualified type name, that is namespaces and type name, followed by a colon and the method name, with an optional signature to bind.

For example, the following are all valid declarations:

MyApp.Services.ScriptService:Accelerate

MyApp.Services.ScriptService:Slowdown(int,bool)

You use method parameters in cases where there might be more than one surface method to managed code. That way you can register different internal calls for different method overloads.

The internal calls are invoked with no marshalling. This means that .NET types like System.String are exposed as MonoString* parameters. This is different than the way that strings are surfaced in P/Invoke.

For more information on how the parameters are marshalled, see the Mono Embedding page.

See the Method Description reference for more information on the format of method descriptions.

@@ -566,7 +525,10 @@ mono_add_internal_call (const char *name, gconstpointer method)
Syntax
-
mono_config_cleanup
+
void +mono_config_cleanup (void) + +

@@ -581,7 +543,10 @@ mono_add_internal_call (const char *name, gconstpointer method)

Syntax
-
mono_config_is_server_mode
+
mono_bool +mono_config_is_server_mode (void) + +

@@ -601,10 +566,8 @@ mono_config_parse (const char *filename)

Parameters
-
filename the filename to load the configuration variables from.
Description
-

- Pass a NULL filename to parse the default config files - (or the file in the MONO_CONFIG env var).

+
filename the filename to load the configuration variables from.
Description
+
Pass a NULL filename to parse the default config files (or the file in the MONO_CONFIG env var).
@@ -624,9 +587,8 @@ mono_config_parse_memory (const char *buffer)

Parameters
-
buffer a pointer to an string XML representation of the configuration
Description
-

- Parses the configuration from a buffer

+
buffer a pointer to an string XML representation of the configuration
Description
+
Parses the configuration from a buffer
@@ -640,7 +602,10 @@ mono_config_parse_memory (const char *buffer)
Syntax
-
mono_config_set_server_mode
+
void +mono_config_set_server_mode (mono_bool server_mode) + +

@@ -655,7 +620,10 @@ mono_config_parse_memory (const char *buffer)

Syntax
-
mono_config_string_for_assembly_file
+
const char * +mono_config_string_for_assembly_file (const char *filename) + +

@@ -670,7 +638,10 @@ mono_config_parse_memory (const char *buffer)

Syntax
-
mono_get_config_dir
+
const char* +mono_get_config_dir (void) + +

@@ -685,7 +656,10 @@ mono_config_parse_memory (const char *buffer)

Syntax
-
mono_get_machine_config
+
const char * +mono_get_machine_config (void) + +

@@ -700,7 +674,10 @@ mono_config_parse_memory (const char *buffer)

Syntax
-
mono_register_machine_config
+
void +mono_register_machine_config (const char *config_xml) + +

@@ -715,8 +692,13 @@ mono_config_parse_memory (const char *buffer)

Syntax
-
mono_set_config_dir
+
void +mono_set_config_dir (const char *dir) + +

+

Description
+
Invoked during startup
@@ -745,17 +727,8 @@ mono_runtime_exec_managed_code (MonoDomain *domain,

Parameters
-
domain Application domain
main_func function to invoke from the execution thread
main_args parameter to the main_func
Description
-

- Launch a new thread to execute a function -

- main_func is called back from the thread with main_args as the - parameter. The callback function is expected to start Main() - eventually. This function then waits for all managed threads to - finish. - It is not necesseray anymore to execute managed code in a subthread, - so this function should not be used anymore by default: just - execute the code and then call mono_thread_manage ().

+
domain Application domain
main_func function to invoke from the execution thread
main_args parameter to the main_func
Description
+
Launch a new thread to execute a function

main_func is called back from the thread with main_args as the parameter. The callback function is expected to start Main eventually. This function then waits for all managed threads to finish. It is not necessary anymore to execute managed code in a subthread, so this function should not be used anymore by default: just execute the code and then call mono_thread_manage().

@@ -790,16 +763,10 @@ mono_init (const char *domain_name)

Return value
-
the initial domain. +
the initial domain.
Description
-

- Creates the initial application domain and initializes the mono_defaults - structure. -

- This function is guaranteed to not run any IL code. - The runtime is initialized using the default runtime version. -

+

Creates the initial application domain and initializes the mono_defaults structure.

This function is guaranteed to not run any IL code. The runtime is initialized using the default runtime version.

@@ -819,20 +786,11 @@ mono_init_from_assembly (const char *domain_name, const char *filename)

Parameters
-
domain_name name to give to the initial domain
filename filename to load on startup
Return value
-
the initial domain. +
domain_name name to give to the initial domain
filename filename to load on startup
Return value
+
the initial domain.
Description
-

- Used by the runtime, users should use mono_jit_init instead. -

- Creates the initial application domain and initializes the mono_defaults - structure. - This function is guaranteed to not run any IL code. - The runtime is initialized using the runtime version required by the - provided executable. The version is determined by looking at the exe - configuration file and the version PE field) -

+

Used by the runtime, users should use mono_jit_init instead.

Creates the initial application domain and initializes the mono_defaults structure. This function is guaranteed to not run any IL code. The runtime is initialized using the runtime version required by the provided executable. The version is determined by looking at the exe configuration file and the version PE field)

@@ -852,18 +810,10 @@ mono_init_version (const char *domain_name, const char *version)

Return value
-
the initial domain. +
the initial domain.
Description
-

- Used by the runtime, users should use mono_jit_init instead. -

- Creates the initial application domain and initializes the mono_defaults - structure. -

- This function is guaranteed to not run any IL code. - The runtime is initialized using the provided rutime version. -

+

Used by the runtime, users should use mono_jit_init instead.

Creates the initial application domain and initializes the mono_defaults structure.

This function is guaranteed to not run any IL code. The runtime is initialized using the provided rutime version.

@@ -883,9 +833,8 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[

Parameters
-
assembly reference to an assembly
argc argument count
argv argument vector
Description
-

- Start execution of a program.

+
assembly reference to an assembly
argc argument count
argv argument vector
Description
+
Start execution of a program.
@@ -899,7 +848,10 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[
Syntax
-
mono_jit_set_aot_mode
+
void +mono_jit_set_aot_mode (MonoAotMode mode) + +

@@ -920,18 +872,8 @@ mono_set_break_policy (MonoBreakPolicyFunc policy_callback)

Parameters
-
policy_callback the new callback function
Description
-

- Allow embedders to decide wherther to actually obey breakpoint instructions - (both break IL instructions and Debugger.Break () method calls), for example - to not allow an app to be aborted by a perfectly valid IL opcode when executing - untrusted or semi-trusted code. -

- policy_callback will be called every time a break point instruction needs to - be inserted with the method argument being the method that calls Debugger.Break() - or has the IL break instruction. The callback should return MONO_BREAK_POLICY_NEVER - if it wants the breakpoint to not be effective in the given method. - MONO_BREAK_POLICY_ALWAYS is the default.

+
policy_callback the new callback function
Description
+

Allow embedders to decide wherther to actually obey breakpoint instructions (both break IL instructions and Debugger.Break method calls), for example to not allow an app to be aborted by a perfectly valid IL opcode when executing untrusted or semi-trusted code.

policy_callback will be called every time a break point instruction needs to be inserted with the method argument being the method that calls Debugger.Break or has the IL break instruction. The callback should return MONO_BREAK_POLICY_NEVER if it wants the breakpoint to not be effective in the given method. MONO_BREAK_POLICY_ALWAYS is the default.

@@ -950,11 +892,11 @@ mono_get_runtime_build_info (void)

+

Return value
+
the runtime version + build date in string format. +
Description
-

- Return the runtime version + build date in string format. - The returned string is owned by the caller. The returned string - format is "VERSION (FULL_VERSION BUILD_DATE)" and build date is optional.

+
The returned string is owned by the caller. The returned string format is VERSION (FULL_VERSION BUILD_DATE) and build date is optional.
@@ -977,18 +919,6 @@ mono_set_signal_chaining (gboolean chain_signals)

Description
-

- Enable/disable signal chaining. This should be called before mono_jit_init (). - If signal chaining is enabled, the runtime saves the original signal handlers before - installing its own handlers, and calls the original ones in the following cases: - - a SIGSEGV/SIGABRT signal received while executing native (i.e. not JITted) code. - - SIGPROF - - SIGFPE - - SIGQUIT - - SIGUSR2 - Signal chaining only works on POSIX platforms.

+

Enable/disable signal chaining. This should be called before mono_jit_init. If signal chaining is enabled, the runtime saves the original signal handlers before installing its own handlers, and calls the original ones in the following cases: - a SIGSEGV / SIGABRT signal received while executing native (i.e. not JITted) code. - SIGPROF - SIGFPE - SIGQUIT - SIGUSR2 Signal chaining only works on POSIX platforms.

- - - diff --git a/docs/deploy/mono-api-exc.html b/docs/deploy/mono-api-exc.html index 1bad9c3d70..100cb1d8ba 100644 --- a/docs/deploy/mono-api-exc.html +++ b/docs/deploy/mono-api-exc.html @@ -226,9 +226,8 @@ mono_raise_exception (MonoException *ex)

Parameters
-
ex exception object
Description
-

- Signal the runtime that the exception ex has been raised in unmanaged code.

+
ex exception object
Description
+
Signal the runtime that the exception ex has been raised in unmanaged code.
@@ -248,15 +247,8 @@ mono_unhandled_exception (MonoObject *exc)

Parameters
-
exc exception thrown
Description
-

- This is a VM internal routine. -

- We call this function when we detect an unhandled exception - in the default domain. -

- It invokes the * UnhandledException event in AppDomain or prints - a warning to the console

+
exc exception thrown
Description
+
This is a VM internal routine.

We call this function when we detect an unhandled exception in the default domain.

It invokes the UnhandledException event in AppDomain or prints a warning to the console

@@ -276,9 +268,8 @@ mono_print_unhandled_exception (MonoObject *exc)

Parameters
-
exc The exception
Description
-

- Prints the unhandled exception.

+
exc The exception
Description
+
Prints the unhandled exception.
@@ -303,14 +294,11 @@ mono_exception_from_name_domain (MonoDomain *domain, MonoImage *image,

Parameters
-
domain Domain where the return object will be created.
image the Mono image where to look for the class
name_space the namespace for the class
name class name
Return value
-
the initialized exception instance. +
domain Domain where the return object will be created.
image the Mono image where to look for the class
name_space the namespace for the class
name class name
Return value
+
the initialized exception instance.
Description
-

- Creates an exception object of the given namespace/name class on - the given domain. -

+

Creates an exception object of the given namespace/name class on the given domain.

@@ -331,14 +319,11 @@ mono_exception_from_name (MonoImage *image, const char *name_space,

Parameters
-
image the Mono image where to look for the class
name_space the namespace for the class
name class name
Return value
-
the initialized exception instance. +
image the Mono image where to look for the class
name_space the namespace for the class
name class name
Return value
+
the initialized exception instance.
Description
-

- Creates an exception of the given namespace/name class in the - current domain. -

+

Creates an exception of the given namespace/name class in the current domain.

@@ -359,13 +344,11 @@ mono_exception_from_name_msg (MonoImage *image, const char *name_space,

Parameters
-
image the Mono image where to look for the class
name_space the namespace for the class
name class name
msg the message to embed inside the exception
Return value
-
the initialized exception instance. +
image the Mono image where to look for the class
name_space the namespace for the class
name class name
msg the message to embed inside the exception
Return value
+
the initialized exception instance.
Description
-

- Creates an exception and initializes its message field. -

+

Creates an exception and initializes its message field.

@@ -386,14 +369,11 @@ mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,

Parameters
-
image the Mono image where to look for the class
name_space the namespace for the class
name class name
a1 first string argument to pass
a2 second string argument to pass
Return value
-
the initialized exception instance. +
image the Mono image where to look for the class
name_space the namespace for the class
name class name
a1 first string argument to pass
a2 second string argument to pass
Return value
+
the initialized exception instance.
Description
-

- Creates an exception from a constructor that takes two string - arguments. -

+

Creates an exception from a constructor that takes two string arguments.

@@ -421,10 +401,8 @@ mono_get_exception_appdomain_unloaded (void)

Return value
-
a new instance of the System.AppDomainUnloadedException +
a new instance of the System.AppDomainUnloadedException
-
Description
-

@@ -444,11 +422,9 @@ mono_get_exception_argument (const char *arg, const char *msg)

Parameters
-
arg the name of the invalid argument.
Return value
-
a new instance of the System.ArgumentException +
arg the name of the invalid argument.
Return value
+
a new instance of the System.ArgumentException
-
Description
-

@@ -468,11 +444,9 @@ mono_get_exception_argument_null (const char *arg)

Parameters
-
arg the name of the argument that is null
Return value
-
a new instance of the System.ArgumentNullException +
arg the name of the argument that is null
Return value
+
a new instance of the System.ArgumentNullException
-
Description
-

@@ -492,11 +466,9 @@ mono_get_exception_argument_out_of_range (const char *arg)

Parameters
-
arg the name of the out of range argument.
Return value
-
a new instance of the System.ArgumentOutOfRangeException +
arg the name of the out of range argument.
Return value
+
a new instance of the System.ArgumentOutOfRangeException
-
Description
-

@@ -516,10 +488,8 @@ mono_get_exception_arithmetic ()

Return value
-
a new instance of the System.ArithmeticException +
a new instance of the System.ArithmeticException
-
Description
-

@@ -539,10 +509,8 @@ mono_get_exception_array_type_mismatch ()

Return value
-
a new instance of the System.ArrayTypeMismatchException +
a new instance of the System.ArrayTypeMismatchException
-
Description
-

@@ -562,11 +530,9 @@ mono_get_exception_bad_image_format (const char *msg)

Parameters
-
msg an informative message for the user.
Return value
-
a new instance of the System.BadImageFormatException +
msg an informative message for the user.
Return value
+
a new instance of the System.BadImageFormatException
-
Description
-

@@ -586,11 +552,9 @@ mono_get_exception_cannot_unload_appdomain (const char *msg)

Parameters
-
inner the inner exception.
Return value
-
a new instance of the System.CannotUnloadAppDomainException +
inner the inner exception.
Return value
+
a new instance of the System.CannotUnloadAppDomainException
-
Description
-

@@ -610,12 +574,10 @@ mono_get_exception_class (void)

Return value
-
The MonoClass* for the `` type. +
The MonoClass* for the type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Exception. -

+
Use this function to get the MonoClass* that the runtime is using for System.Exception .
@@ -635,10 +597,8 @@ mono_get_exception_divide_by_zero ()

Return value
-
a new instance of the System.DivideByZeroException +
a new instance of the System.DivideByZeroException
-
Description
-

@@ -658,11 +618,9 @@ mono_get_exception_execution_engine (const char *msg)

Parameters
-
msg the message to pass to the user
Return value
-
a new instance of the System.ExecutionEngineException +
msg the message to pass to the user
Return value
+
a new instance of the System.ExecutionEngineException
-
Description
-

@@ -682,11 +640,9 @@ mono_get_exception_file_not_found2 (const char *msg, MonoString *fname)

Parameters
-
msg an informative message for the user.
fname the name of the file not found.
Return value
-
a new instance of the System.IO.FileNotFoundException +
msg an informative message for the user.
fname the name of the file not found.
Return value
+
a new instance of the System.IO.FileNotFoundException
-
Description
-

@@ -706,11 +662,9 @@ mono_get_exception_file_not_found (MonoString *fname)

Parameters
-
fname the name of the file not found.
Return value
-
a new instance of the System.IO.FileNotFoundException +
fname the name of the file not found.
Return value
+
a new instance of the System.IO.FileNotFoundException
-
Description
-

@@ -730,10 +684,8 @@ mono_get_exception_index_out_of_range ()

Return value
-
a new instance of the System.IndexOutOfRangeException +
a new instance of the System.IndexOutOfRangeException
-
Description
-

@@ -753,10 +705,8 @@ mono_get_exception_invalid_cast ()

Return value
-
a new instance of the System.InvalidCastException +
a new instance of the System.InvalidCastException
-
Description
-

@@ -776,11 +726,9 @@ mono_get_exception_io (const char *msg)

Parameters
-
msg the message to present to the user
Return value
-
a new instance of the System.IO.IOException +
msg the message to present to the user
Return value
+
a new instance of the System.IO.IOException
-
Description
-

@@ -800,11 +748,9 @@ mono_get_exception_missing_method (const char *class_name, const char *member_na

Parameters
-
class_name the class where the lookup was performed.
member_name the name of the missing method.
Return value
-
a new instance of the System.MissingMethodException +
class_name the class where the lookup was performed.
member_name the name of the missing method.
Return value
+
a new instance of the System.MissingMethodException
-
Description
-

@@ -824,11 +770,9 @@ mono_get_exception_not_implemented (const char *msg)

Parameters
-
msg the message to pass to the user
Return value
-
a new instance of the System.NotImplementedException +
msg the message to pass to the user
Return value
+
a new instance of the System.NotImplementedException
-
Description
-

@@ -848,10 +792,8 @@ mono_get_exception_null_reference ()

Return value
-
a new instance of the System.NullReferenceException +
a new instance of the System.NullReferenceException
-
Description
-

@@ -871,10 +813,8 @@ mono_get_exception_overflow ()

Return value
-
a new instance of the System.OverflowException +
a new instance of the System.OverflowException
-
Description
-

@@ -894,10 +834,8 @@ mono_get_exception_security ()

Return value
-
a new instance of the System.Security.SecurityException +
a new instance of the System.Security.SecurityException
-
Description
-

@@ -917,11 +855,9 @@ mono_get_exception_serialization (const char *msg)

Parameters
-
msg the message to pass to the user
Return value
-
a new instance of the System.Runtime.Serialization.SerializationException +
msg the message to pass to the user
Return value
+
a new instance of the System.Runtime.Serialization.SerializationException
-
Description
-

@@ -941,10 +877,8 @@ mono_get_exception_stack_overflow (void)

Return value
-
a new instance of the System.StackOverflowException +
a new instance of the System.StackOverflowException
-
Description
-

@@ -964,11 +898,9 @@ mono_get_exception_synchronization_lock (const char *msg)

Parameters
-
inner the inner exception.
Return value
-
a new instance of the System.SynchronizationLockException +
inner the inner exception.
Return value
+
a new instance of the System.SynchronizationLockException
-
Description
-

@@ -988,10 +920,8 @@ mono_get_exception_thread_abort ()

Return value
-
a new instance of the System.Threading.ThreadAbortException +
a new instance of the System.Threading.ThreadAbortException
-
Description
-

@@ -1011,11 +941,9 @@ mono_get_exception_thread_state (const char *msg)

Parameters
-
msg the message to present to the user
Return value
-
a new instance of the System.Threading.ThreadStateException +
msg the message to present to the user
Return value
+
a new instance of the System.Threading.ThreadStateException
-
Description
-

@@ -1035,11 +963,9 @@ mono_get_exception_type_initialization (const gchar *type_name, MonoException *i

Parameters
-
type_name the name of the type that failed to initialize.
inner the inner exception.
Return value
-
a new instance of the System.TypeInitializationException +
type_name the name of the type that failed to initialize.
inner the inner exception.
Return value
+
a new instance of the System.TypeInitializationException
-
Description
-

@@ -1059,11 +985,9 @@ mono_get_exception_type_load (MonoString *class_name, char *assembly_name)

Parameters
-
class_name the name of the class that could not be loaded
assembly_name the assembly where the class was looked up.
Return value
-
a new instance of the System.TypeLoadException +
class_name the name of the class that could not be loaded
assembly_name the assembly where the class was looked up.
Return value
+
a new instance of the System.TypeLoadException
-
Description
-

@@ -1083,11 +1007,9 @@ mono_get_exception_invalid_operation (const char *msg)

Parameters
-
msg the message to pass to the user
Return value
-
a new instance of the System.InvalidOperationException +
msg the message to pass to the user
Return value
+
a new instance of the System.InvalidOperationException
-
Description
-

@@ -1107,11 +1029,9 @@ mono_get_exception_missing_field (const char *class_name, const char *member_nam

Parameters
-
class_name the class where the lookup was performed
member_name the name of the missing method.
Return value
-
a new instance of the System.MissingFieldException +
class_name the class where the lookup was performed
member_name the name of the missing method.
Return value
+
a new instance of the System.MissingFieldException
-
Description
-

@@ -1131,11 +1051,9 @@ mono_get_exception_not_supported (const char *msg)

Parameters
-
msg the message to pass to the user
Return value
-
a new instance of the System.NotSupportedException +
msg the message to pass to the user
Return value
+
a new instance of the System.NotSupportedException
-
Description
-

@@ -1155,11 +1073,9 @@ mono_get_exception_reflection_type_load (MonoArray *types_raw, MonoArray *except

Parameters
-
types an array of types that were defined in the moduled loaded.
exceptions an array of exceptions that were thrown during the type loading.
Return value
-
a new instance of the System.Reflection.ReflectionTypeLoadException +
types an array of types that were defined in the moduled loaded.
exceptions an array of exceptions that were thrown during the type loading.
Return value
+
a new instance of the System.Reflection.ReflectionTypeLoadException
-
Description
-

@@ -1180,9 +1096,7 @@ mono_exception_from_token_two_strings (MonoImage *image, guint32 token,

Description
-

- Same as mono_exception_from_name_two_strings, but lookup the exception class using - IMAGE and TOKEN.

+

Same as mono_exception_from_name_two_strings, but lookup the exception class using IMAGE and TOKEN.

@@ -1202,11 +1116,9 @@ mono_get_exception_bad_image_format2 (const char *msg, MonoString *fname)

Parameters
-
msg an informative message for the user.
fname The full name of the file with the invalid image.
Return value
-
a new instance of the System.BadImageFormatException +
msg an informative message for the user.
fname The full name of the file with the invalid image.
Return value
+
a new instance of the System.BadImageFormatException
-
Description
-

@@ -1226,10 +1138,8 @@ mono_get_exception_field_access (void)

Return value
-
a new instance of the System.FieldAccessException +
a new instance of the System.FieldAccessException
-
Description
-

@@ -1249,10 +1159,8 @@ mono_get_exception_method_access (void)

Return value
-
a new instance of the System.MethodAccessException +
a new instance of the System.MethodAccessException
-
Description
-

@@ -1272,10 +1180,8 @@ mono_get_exception_out_of_memory (void)

Return value
-
a new instance of the System.OutOfMemoryException +
a new instance of the System.OutOfMemoryException
-
Description
-

@@ -1289,10 +1195,10 @@ mono_get_exception_out_of_memory (void)
Syntax
-
mono_get_exception_runtime_wrapped
+
MonoException* +mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception) + +

- - - diff --git a/docs/deploy/mono-api-gc.html b/docs/deploy/mono-api-gc.html index e51976f564..d55073e455 100644 --- a/docs/deploy/mono-api-gc.html +++ b/docs/deploy/mono-api-gc.html @@ -211,15 +211,8 @@ mono_gc_collect (int generation)

Parameters
-
generation GC generation identifier
Description
-

- Perform a garbage collection for the given generation, higher numbers - mean usually older objects. Collecting a high-numbered generation - implies collecting also the lower-numbered generations. - The maximum value for generation can be retrieved with a call to - mono_gc_max_generation(), so this function is usually called as: -

- mono_gc_collect (mono_gc_max_generation ());

+
generation GC generation identifier
Description
+

Perform a garbage collection for the given generation, higher numbers mean usually older objects. Collecting a high-numbered generation implies collecting also the lower-numbered generations. The maximum value for generation can be retrieved with a call to mono_gc_max_generation, so this function is usually called as:

mono_gc_collect (mono_gc_max_generation ());

@@ -239,14 +232,11 @@ mono_gc_collection_count (int generation)

Parameters
-
generation a GC generation number
Return value
-
the number of garbage collections +
generation a GC generation number
Return value
+
the number of garbage collections
Description
-

- Get how many times a garbage collection has been performed - for the given generation number. -

+

Get how many times a garbage collection has been performed for the given generation number.

@@ -266,14 +256,10 @@ mono_gc_max_generation (void)

Return value
-
the maximum generation number. +
the maximum generation number.
Description
-

- Get the maximum generation number used by the current garbage - collector. The value will be 0 for the Boehm collector, 1 or more - for the generational collectors. -

+

Get the maximum generation number used by the current garbage collector. The value will be 0 for the Boehm collector, 1 or more for the generational collectors.

@@ -293,14 +279,11 @@ mono_gc_get_generation (MonoObject *object)

Parameters
-
object a managed object
Return value
-
a garbage collector generation number +
object a managed object
Return value
+
a garbage collector generation number
Description
-

- Get the garbage collector's generation that object belongs to. - Use this has a hint only. -

+

Get the garbage collector's generation that object belongs to. Use this has a hint only.

@@ -320,12 +303,10 @@ mono_gc_get_heap_size (void)

Return value
-
the size of the heap in bytes +
the size of the heap in bytes
Description
-

- Get the amount of memory used by the garbage collector. -

+

Get the amount of memory used by the garbage collector.

@@ -345,12 +326,10 @@ mono_gc_get_used_size (void)

Return value
-
the amount of memory used in bytes +
the amount of memory used in bytes
Description
-

- Get the approximate amount of memory used by managed objects. -

+

Get the approximate amount of memory used by managed objects.

@@ -370,22 +349,11 @@ mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data)

Parameters
-
flags flags for future use
callback a function pointer called for each object in the heap
data a user data pointer that is passed to callback
Return value
-
a non-zero value if the GC doesn't support heap walking +
flags flags for future use
callback a function pointer called for each object in the heap
data a user data pointer that is passed to callback
Return value
+
a non-zero value if the GC doesn't support heap walking
Description
-

- This function can be used to iterate over all the live objects in the heap: - for each object, callback is invoked, providing info about the object's - location in memory, its class, its size and the objects it references. - For each referenced object it's offset from the object address is - reported in the offsets array. - The object references may be buffered, so the callback may be invoked - multiple times for the same object: in all but the first call, the size - argument will be zero. - Note that this function can be only called in the MONO_GC_EVENT_PRE_START_WORLD - profiler event handler. -

+
This function can be used to iterate over all the live objects in the heap; for each object, callback is invoked, providing info about the object's location in memory, its class, its size and the objects it references. For each referenced object its offset from the object address is reported in the offsets array. The object references may be buffered, so the callback may be invoked multiple times for the same object: in all but the first call, the size argument will be zero. Note that this function can be only called in the MONO_GC_EVENT_PRE_START_WORLD profiler event handler.
@@ -407,16 +375,12 @@ mono_gc_reference_queue_add (MonoReferenceQueue *queue, MonoObject *obj, void *u

+

Parameters
+
queue the queue to add the reference to.
obj the object to be watched for collection
user_data parameter to be passed to the queue callback
Return value
+
FALSE if the queue is scheduled to be freed. +
Description
-
queue the queue to add the reference to. - obj the object to be watched for collection - user_data parameter to be passed to the queue callback -

- Queue an object to be watched for collection, when the obj is - collected, the callback that was registered for the queue will - be invoked with user_data as argument. -

- returns false if the queue is scheduled to be freed.

+

Queue an object to be watched for collection, when the obj is collected, the callback that was registered for the queue will be invoked with user_data as argument.

@@ -435,14 +399,9 @@ mono_gc_reference_queue_free (MonoReferenceQueue *queue)

-

Description
-
queue the queue that should be freed. -

- This operation signals that queue should be freed. This operation is deferred - as it happens on the finalizer thread. -

- After this call, no further objects can be queued. It's the responsibility of the - caller to make sure that no further attempt to access queue will be made.

+
Parameters
+
queue the queue that should be freed.
Description
+

This operation signals that queue should be freed. This operation is deferred as it happens on the finalizer thread.

After this call, no further objects can be queued. It's the responsibility of the caller to make sure that no further attempt to access queue will be made.

@@ -461,21 +420,12 @@ mono_gc_reference_queue_new (mono_reference_queue_callback callback)

+

Parameters
+
callback callback used when processing collected entries.
Return value
+
the new queue. +
Description
-
callback callback used when processing collected entries. -

- Create a new reference queue used to process collected objects. - A reference queue let you add a pair of (managed object, user data) - using the mono_gc_reference_queue_add method. -

- Once the managed object is collected callback will be called - in the finalizer thread with 'user data' as argument. -

- The callback is called from the finalizer thread without any locks held. - When a AppDomain is unloaded, all callbacks for objects belonging to it - will be invoked. -

- returns the new queue.

+

Create a new reference queue used to process collected objects. A reference queue let you add a pair of (managed object, user data) using the mono_gc_reference_queue_add method.

Once the managed object is collected callback will be called in the finalizer thread with 'user data' as argument.

The callback is called from the finalizer thread without any locks held. When an AppDomain is unloaded, all callbacks for objects belonging to it will be invoked.

@@ -573,7 +523,10 @@ typedef struct {
Syntax
-
mono_gc_register_bridge_callbacks
+
void +mono_gc_register_bridge_callbacks (MonoGCBridgeCallbacks *callbacks) + +

@@ -588,7 +541,10 @@ typedef struct {

Syntax
-
mono_gc_wait_for_bridge_processing
+
void +mono_gc_wait_for_bridge_processing (void) + +

@@ -606,7 +562,10 @@ typedef struct {

Syntax
-
mono_gc_wbarrier_arrayref_copy
+
void +mono_gc_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count) + +

@@ -621,7 +580,10 @@ typedef struct {

Syntax
-
mono_gc_wbarrier_generic_nostore
+
void +mono_gc_wbarrier_generic_nostore (gpointer ptr) + +

@@ -636,7 +598,10 @@ typedef struct {

Syntax
-
mono_gc_wbarrier_generic_store
+
void +mono_gc_wbarrier_generic_store (gpointer ptr, GCObject* value) + +

@@ -651,8 +616,13 @@ typedef struct {

Syntax
-
mono_gc_wbarrier_generic_store_atomic
+
void +mono_gc_wbarrier_generic_store_atomic (gpointer ptr, GCObject *value) + +

+

Description
+
Same as mono_gc_wbarrier_generic_store but performs the store as an atomic operation with release semantics.
@@ -672,8 +642,7 @@ mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src)

Description
-

- Write barrier to call when obj is the result of a clone or copy of an object.

+

Write barrier to call when obj is the result of a clone or copy of an object.

@@ -687,7 +656,10 @@ mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src)
Syntax
-
mono_gc_wbarrier_set_arrayref
+
void +mono_gc_wbarrier_set_arrayref (MonoArray *arr, gpointer slot_ptr, MonoObject* value) + +

@@ -702,10 +674,10 @@ mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src)

Syntax
-
mono_gc_wbarrier_set_field
+
void +mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value) + +

- - - diff --git a/docs/deploy/mono-api-gchandle.html b/docs/deploy/mono-api-gchandle.html index e37698f84f..c2ab9912c6 100644 --- a/docs/deploy/mono-api-gchandle.html +++ b/docs/deploy/mono-api-gchandle.html @@ -192,12 +192,6 @@

Synopsys

-guint32 mono_gchandle_new (GCObject *obj, - gboolean pinned); -guint32 mono_gchandle_new_weakref (GCObject *obj, - gboolean track_resurrection); -GCObject* mono_gchandle_get_target (guint32 gchandle); -void mono_gchandle_free (guint32 gchandle);
@@ -297,21 +291,11 @@ mono_gchandle_new (GCObject *obj, gboolean pinned)

Parameters
-
obj managed object to get a handle for
pinned whether the object should be pinned
Return value
-
a handle that can be used to access the object from - - unmanaged code.
+
obj managed object to get a handle for
pinned whether the object should be pinned
Return value
+
a handle that can be used to access the object from unmanaged code. +
Description
-

- This returns a handle that wraps the object, this is used to keep a - reference to a managed object from the unmanaged world and preventing the - object from being disposed. -

- If pinned is false the address of the object can not be obtained, if it is - true the address of the object can be obtained. This will also pin the - object so it will not be possible by a moving garbage collector to move the - object. -

+
This returns a handle that wraps the object, this is used to keep a reference to a managed object from the unmanaged world and preventing the object from being disposed.

If pinned is false the address of the object can not be obtained, if it is true the address of the object can be obtained. This will also pin the object so it will not be possible by a moving garbage collector to move the object.

@@ -331,25 +315,12 @@ mono_gchandle_new_weakref (GCObject *obj, gboolean track_resurrection)

Parameters
-
obj managed object to get a handle for
track_resurrection Determines how long to track the object, if this is set to TRUE, the object is tracked after finalization, if FALSE, the object is only tracked up until the point of finalization.
Return value
-
a handle that can be used to access the object from +
obj managed object to get a handle for
track_resurrection Determines how long to track the object, if this is set to TRUE, the object is tracked after finalization, if FALSE, the object is only tracked up until the point of finalization.
Return value
+
a handle that can be used to access the object from unmanaged code.
Description
-

- This returns a weak handle that wraps the object, this is used to - keep a reference to a managed object from the unmanaged world. - Unlike the mono_gchandle_new the object can be reclaimed by the - garbage collector. In this case the value of the GCHandle will be - set to zero. -

- If track_resurrection is TRUE the object will be tracked through - finalization and if the object is resurrected during the execution - of the finalizer, then the returned weakref will continue to hold - a reference to the object. If track_resurrection is FALSE, then - the weak reference's target will become NULL as soon as the object - is passed on to the finalizer. -

+

This returns a weak handle that wraps the object, this is used to keep a reference to a managed object from the unmanaged world. Unlike the mono_gchandle_new the object can be reclaimed by the garbage collector. In this case the value of the GCHandle will be set to zero.

If track_resurrection is TRUE the object will be tracked through finalization and if the object is resurrected during the execution of the finalizer, then the returned weakref will continue to hold a reference to the object. If track_resurrection is FALSE, then the weak reference's target will become NULL as soon as the object is passed on to the finalizer.

@@ -369,15 +340,11 @@ mono_gchandle_get_target (guint32 gchandle)

Parameters
-
gchandle a GCHandle's handle.
Description
-

- The handle was previously created by calling mono_gchandle_new or - mono_gchandle_new_weakref. -

- Returns a pointer to the MonoObject* represented by the handle or +
gchandle a GCHandle's handle.

Return value
+
a pointer to the MonoObject* represented by the handle or + NULL for a collected object if using a weakref handle.
+
Description
+

The handle was previously created by calling mono_gchandle_new or mono_gchandle_new_weakref.

- - - diff --git a/docs/deploy/mono-api-image.html b/docs/deploy/mono-api-image.html index 75d9f6d28a..4627bf184d 100644 --- a/docs/deploy/mono-api-image.html +++ b/docs/deploy/mono-api-image.html @@ -206,58 +206,6 @@ typedef enum { MONO_IMAGE_IMAGE_INVALID } MonoImageOpenStatus; - mono_load_image -MonoImage* mono_image_open (const char *fname, - MonoImageOpenStatus *status); - mono_image_open_full - mono_image_open_from_data - mono_image_open_from_data_full -void mono_image_close (MonoImage *image); -void mono_image_addref (MonoImage *image); - mono_image_load_file_for_image - mono_image_open_from_data_with_name - mono_image_load_module - mono_image_get_guid -MonoAssembly* mono_image_get_assembly (MonoImage *image); -guint32 mono_image_get_entry_point (MonoImage *image); -const char* mono_image_get_filename (MonoImage *image); -const char* mono_image_get_name (MonoImage *image); -const char* mono_image_get_resource (MonoImage *image, - guint32 offset, - guint32 *size); - mono_image_get_table_info - mono_image_get_table_rows -gboolean mono_image_is_dynamic (MonoImage *image); - mono_image_loaded_by_guid -MonoImage* mono_image_loaded (const char *name); -gpointer mono_image_lookup_resource (MonoImage *image, - guint32 res_id, - guint32 lang_id, - gunichar2 *name); -const char * mono_image_strerror (MonoImageOpenStatus status); -MonoMethod* mono_get_method_constrained (MonoImage *image, - guint32 token, - MonoClass *constrained_class; -guint32 mono_image_strong_name_position (MonoImage *image, - guint32 *size); -const char* mono_image_get_public_key (MonoImage *image, - guint32 *size); -const char* mono_image_get_strong_name (MonoImage *image, - guint32 *size); -gboolean mono_image_has_authenticode_entry (MonoImage *image); - mono_image_rva_map -int mono_image_ensure_section_idx (MonoImage *image, - int section); -int mono_image_ensure_section (MonoImage *image, - const char *section); - mono_image_init -void mono_images_init (void); -void mono_images_cleanup (void); - mono_image_add_to_name_cache - mono_image_fixup_vtable - mono_image_loaded_by_guid_full - mono_image_loaded_full - mono_lookup_icall_symbol @@ -268,21 +216,6 @@ void mono_images_cleanup

Opening and closing MonoImages

- -
-
mono_load_image
-
-
-
-
- -
Syntax
-
mono_load_image
-

-

-
-
-
mono_image_open
@@ -298,14 +231,12 @@ mono_image_open (const char *fname, MonoImageOpenStatus *status)

Parameters
-
fname filename that points to the module we want to open
status An error condition is returned in this field
Return value
-
An open image of type %MonoImage or NULL on error. +
fname filename that points to the module we want to open
status An error condition is returned in this field
Return value
+
An open image of type MonoImage or NULL on error. The caller holds a temporary reference to the returned image which should be cleared - when no longer needed by calling mono_image_close (). + when no longer needed by calling mono_image_close. if NULL, then check the value of status for details on the error
-
Description
-

@@ -319,7 +250,10 @@ mono_image_open (const char *fname, MonoImageOpenStatus *status)
Syntax
-
mono_image_open_full
+
MonoImage* +mono_image_open_full (const char *fname, MonoImageOpenStatus *status, gboolean refonly) + +

@@ -334,7 +268,10 @@ mono_image_open (const char *fname, MonoImageOpenStatus *status)

Syntax
-
mono_image_open_from_data
+
MonoImage* +mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status) + +

@@ -349,7 +286,10 @@ mono_image_open (const char *fname, MonoImageOpenStatus *status)

Syntax
-
mono_image_open_from_data_full
+
MonoImage* +mono_image_open_from_data_full (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status, gboolean refonly) + +

@@ -370,10 +310,8 @@ mono_image_close (MonoImage *image)

Parameters
-
image The image file we wish to close
Description
-

- Closes an image file, deallocates all memory consumed and - unmaps all possible sections of the file

+
image The image file we wish to close
Description
+
Closes an image file, deallocates all memory consumed and unmaps all possible sections of the file
@@ -393,9 +331,8 @@ mono_image_addref (MonoImage *image)

Parameters
-
image The image file we wish to add a reference to
Description
-

- Increases the reference count of an image.

+
image The image file we wish to add a reference to
Description
+
Increases the reference count of an image.
@@ -409,7 +346,10 @@ mono_image_addref (MonoImage *image)
Syntax
-
mono_image_load_file_for_image
+
MonoImage* +mono_image_load_file_for_image (MonoImage *image, int fileidx) + +

@@ -424,7 +364,10 @@ mono_image_addref (MonoImage *image)

Syntax
-
mono_image_open_from_data_with_name
+
MonoImage* +mono_image_open_from_data_with_name (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status, gboolean refonly, const char *name) + +

@@ -439,7 +382,10 @@ mono_image_addref (MonoImage *image)

Syntax
-
mono_image_load_module
+
MonoImage* +mono_image_load_module (MonoImage *image, int idx) + +

@@ -457,7 +403,10 @@ mono_image_addref (MonoImage *image)

Syntax
-
mono_image_get_guid
+
const char* +mono_image_get_guid (MonoImage *image) + +

@@ -478,13 +427,11 @@ mono_image_get_assembly (MonoImage *image)

Parameters
-
image the MonoImage.
Return value
-
the assembly that holds this image. +
image the MonoImage .
Return value
+
the assembly that holds this image.
Description
-

- Use this routine to get the assembly that owns this image. -

+
Use this routine to get the assembly that owns this image.
@@ -504,14 +451,11 @@ mono_image_get_entry_point (MonoImage *image)

Parameters
-
image the image where the entry point will be looked up.
Return value
-
the token for the entry point method in the image +
image the image where the entry point will be looked up.
Return value
+
the token for the entry point method in the image
Description
-

- Use this routine to determine the metadata token for method that - has been flagged as the entry point. -

+
Use this routine to determine the metadata token for method that has been flagged as the entry point.
@@ -531,13 +475,11 @@ mono_image_get_filename (MonoImage *image)

Parameters
-
image a MonoImage
Return value
-
the filename. +
image a MonoImage
Return value
+
the filename.
Description
-

- Used to get the filename that hold the actual MonoImage -

+
Used to get the filename that hold the actual MonoImage
@@ -557,11 +499,9 @@ mono_image_get_name (MonoImage *image)

Parameters
-
name a MonoImage
Return value
-
the name of the assembly. +
name a MonoImage
Return value
+
the name of the assembly.
-
Description
-

@@ -581,15 +521,11 @@ mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)

Parameters
-
image the image where the resource will be looked up.
offset The offset to add to the resource
size a pointer to an int where the size of the resource will be stored
Return value
-
the pointer to the resource whose offset is offset. +
image the image where the resource will be looked up.
offset The offset to add to the resource
size a pointer to an int where the size of the resource will be stored
Return value
+
the pointer to the resource whose offset is offset.
Description
-

- This is a low-level routine that fetches a resource from the - metadata that starts at a given offset. The size parameter is - filled with the data field as encoded in the metadata. -

+

This is a low-level routine that fetches a resource from the metadata that starts at a given offset. The size parameter is filled with the data field as encoded in the metadata.

@@ -603,7 +539,10 @@ mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
Syntax
-
mono_image_get_table_info
+
const MonoTableInfo* +mono_image_get_table_info (MonoImage *image, int table_id) + +

@@ -618,7 +557,10 @@ mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)

Syntax
-
mono_image_get_table_rows
+
int +mono_image_get_table_rows (MonoImage *image, int table_id) + +

@@ -639,14 +581,11 @@ mono_image_is_dynamic (MonoImage *image)

Parameters
-
image the MonoImage
Return value
-
TRUE if the image was created dynamically, FALSE if not. +
image the MonoImage
Return value
+
TRUE if the image was created dynamically, FALSE if not.
Description
-

- Determines if the given image was created dynamically through the - System.Reflection.Emit API -

+

Determines if the given image was created dynamically through the System.Reflection.Emit API

@@ -660,7 +599,10 @@ mono_image_is_dynamic (MonoImage *image)
Syntax
-
mono_image_loaded_by_guid
+
MonoImage* +mono_image_loaded_by_guid (const char *guid) + +

@@ -681,13 +623,11 @@ mono_image_loaded (const char *name)

Parameters
-
name path or assembly name of the image to load
Return value
-
the loaded MonoImage, or NULL on failure. +
name path or assembly name of the image to load
Return value
+
the loaded MonoImage, or NULL on failure.
Description
-

- This routine verifies that the given image is loaded. Reflection-only loads do not count. -

+
This routine verifies that the given image is loaded. Reflection-only loads do not count.
@@ -707,13 +647,11 @@ mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, g

Parameters
-
image the image to look up the resource in
res_id A MONO_PE_RESOURCE_ID_ that represents the resource ID to lookup.
lang_id The language id.
name the resource name to lookup.
Return value
-
NULL if not found, otherwise a pointer to the in-memory representation +
image the image to look up the resource in
res_id A MONO_PE_RESOURCE_ID_ that represents the resource ID to lookup.
lang_id The language id.
name the resource name to lookup.
Return value
+
NULL if not found, otherwise a pointer to the in-memory representation - of the given resource. The caller should free it using g_free () when no longer + of the given resource. The caller should free it using g_free when no longer needed.
-
Description
-

@@ -733,11 +671,9 @@ mono_image_strerror (MonoImageOpenStatus status)

Parameters
-
status an code indicating the result from a recent operation
Return value
-
a string describing the error +
status an code indicating the result from a recent operation
Return value
+
a string describing the error
-
Description
-

@@ -757,13 +693,13 @@ mono_get_method_constrained (MonoImage *image, guint32 token, MonoClass *constra

+

Return value
+
The contrained method, which has been inflated + + as the function return value; and the original CIL-stream method as + declared in cil_method. The latter is used for verification.
Description
-

- This is used when JITing the `constrained.' opcode. -

- This returns two values: the contrained method, which has been inflated - as the function return value; And the original CIL-stream method as - declared in cil_method. The later is used for verification.

+
This is used when JITing the constrained. opcode.
@@ -786,15 +722,12 @@ mono_image_strong_name_position (MonoImage *image, guint32 *size)

Parameters
-
image a MonoImage
size a guint32 pointer, or NULL.
Return value
-
the position within the image file where the strong name +
image a MonoImage
size a guint32 pointer, or NULL.
Return value
+
the position within the image file where the strong name is stored.
Description
-

- If the image has a strong name, and size is not NULL, the value - pointed to by size will have the size of the strong name. -

+

If the image has a strong name, and size is not NULL, the value pointed to by size will have the size of the strong name.

@@ -814,17 +747,12 @@ mono_image_get_public_key (MonoImage *image, guint32 *size)

Parameters
-
image a MonoImage
size a guint32 pointer, or NULL.
Return value
-
NULL if the image does not have a public key, or a pointer +
image a MonoImage
size a guint32 pointer, or NULL.
Return value
+
NULL if the image does not have a public key, or a pointer to the public key.
Description
-

- This is used to obtain the public key in the image. -

- If the image has a public key, and size is not NULL, the value - pointed to by size will have the size of the public key. -

+

This is used to obtain the public key in the image.

If the image has a public key, and size is not NULL, the value pointed to by size will have the size of the public key.

@@ -844,15 +772,12 @@ mono_image_get_strong_name (MonoImage *image, guint32 *size)

Parameters
-
image a MonoImage
size a guint32 pointer, or NULL.
Return value
-
NULL if the image does not have a strong name, or a +
image a MonoImage
size a guint32 pointer, or NULL.
Return value
+
NULL if the image does not have a strong name, or a pointer to the public key.
Description
-

- If the image has a strong name, and size is not NULL, the value - pointed to by size will have the size of the strong name. -

+

If the image has a strong name, and size is not NULL, the value pointed to by size will have the size of the strong name.

@@ -872,15 +797,12 @@ mono_image_has_authenticode_entry (MonoImage *image)

Parameters
-
image the MonoImage
Return value
-
TRUE if the image contains an authenticode entry in the PE +
image the MonoImage
Return value
+
TRUE if the image contains an authenticode entry in the PE directory.
Description
-

- Use this routine to determine if the image has a Authenticode - Certificate Table. -

+
Use this routine to determine if the image has a Authenticode Certificate Table.
@@ -897,8 +819,18 @@ mono_image_has_authenticode_entry (MonoImage *image)
Syntax
-
mono_image_rva_map
+
char* +mono_image_rva_map (MonoImage *image, guint32 addr) + +

+

Parameters
+
image a MonoImage
addr relative virtual address (RVA)
Return value
+
the address in memory for the given RVA, or NULL if the + + RVA is not valid for this image.
+
Description
+

This is a low-level routine used by the runtime to map relative virtual address (RVA) into their location in memory.

@@ -918,14 +850,11 @@ mono_image_ensure_section_idx (MonoImage *image, int section)

Parameters
-
image The image we are operating on
section section number that we will load/map into memory
Return value
-
TRUE on success +
image The image we are operating on
section section number that we will load/map into memory
Return value
+
TRUE on success
Description
-

- This routine makes sure that we have an in-memory copy of - an image section (.text, .rsrc, .data). -

+

This routine makes sure that we have an in-memory copy of an image section (.text, .rsrc, .data).

@@ -945,14 +874,11 @@ mono_image_ensure_section (MonoImage *image, const char *section)

Parameters
-
image The image we are operating on
section section name that we will load/map into memory
Return value
-
TRUE on success +
image The image we are operating on
section section name that we will load/map into memory
Return value
+
TRUE on success
Description
-

- This routine makes sure that we have an in-memory copy of - an image section (.text, .rsrc, .data). -

+

This routine makes sure that we have an in-memory copy of an image section (.text, .rsrc, .data).

@@ -966,7 +892,10 @@ mono_image_ensure_section (MonoImage *image, const char *section)
Syntax
-
mono_image_init
+
void +mono_image_init (MonoImage *image) + +

@@ -987,8 +916,7 @@ mono_images_init (void)

Description
-

- Initialize the global variables used by this module.

+

Initialize the global variables used by this module.

@@ -1008,8 +936,7 @@ mono_images_cleanup (void)

Description
-

- Free all resources used by this module.

+

Free all resources used by this module.

@@ -1023,7 +950,11 @@ mono_images_cleanup (void)
Syntax
-
mono_image_add_to_name_cache
+
void +mono_image_add_to_name_cache (MonoImage *image, const char *nspace, + const char *name, guint32 index) + +

@@ -1038,7 +969,10 @@ mono_images_cleanup (void)

Syntax
-
mono_image_fixup_vtable
+
void +mono_image_fixup_vtable (MonoImage *image) + +

@@ -1053,7 +987,10 @@ mono_images_cleanup (void)

Syntax
-
mono_image_loaded_by_guid_full
+
MonoImage* +mono_image_loaded_by_guid_full (const char *guid, gboolean refonly) + +

@@ -1068,10 +1005,16 @@ mono_images_cleanup (void)

Syntax
-
mono_image_loaded_full
+
MonoImage* +mono_image_loaded_full (const char *name, gboolean refonly) + +

+

Parameters
+
name path or assembly name of the image to load
refonly Check with respect to reflection-only loads?
Return value
+
the loaded MonoImage, or NULL on failure. +
+
Description
+

This routine verifies that the given image is loaded. It checks either reflection-only loads only, or normal loads only, as specified by parameter.

- - - diff --git a/docs/deploy/mono-api-internal.html b/docs/deploy/mono-api-internal.html index a278b091d3..3cf88ad965 100644 --- a/docs/deploy/mono-api-internal.html +++ b/docs/deploy/mono-api-internal.html @@ -227,18 +227,8 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Parameters
-
in pointers to the buffer.
bytes number of bytes in the string.
Description
-

- Tries to turn a NULL-terminated string into UTF16. -

- First, see if it's valid UTF8, in which case just turn it directly - into UTF16. Next, run through the colon-separated encodings in - MONO_EXTERNAL_ENCODINGS and do an iconv conversion on each, - returning the first successful conversion to UTF16. If no - conversion succeeds, return NULL. -

- Callers must free the returned string if not NULL. bytes holds the number - of bytes in the returned string, not including the terminator.

+
in pointers to the buffer.
bytes number of bytes in the string.
Description
+
Tries to turn a NULL-terminated string into UTF-16.

First, see if it's valid UTF-8, in which case just turn it directly into UTF-16. Next, run through the colon-separated encodings in MONO_EXTERNAL_ENCODINGS and do an iconv conversion on each, returning the first successful conversion to UTF-16. If no conversion succeeds, return NULL.

Callers must free the returned string if not NULL. bytes holds the number of bytes in the returned string, not including the terminator.

@@ -257,13 +247,8 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Parameters
-
uni an UTF16 string to conver to an external representation.
Description
-

- Turns NULL-terminated UTF16 into either UTF8, or the first - working item in MONO_EXTERNAL_ENCODINGS if set. If no conversions - work, then UTF8 is returned. -

- Callers must free the returned string.

+
uni a UTF-16 string to convert to an external representation.
Description
+
Turns NULL-terminated UTF-16 into either UTF-8, or the first working item in MONO_EXTERNAL_ENCODINGS if set. If no conversions work, then UTF-8 is returned. Callers must free the returned string.
@@ -282,21 +267,8 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Parameters
-
in pointer to the string buffer.
Description
-

- Tries to turn a NULL-terminated string into UTF8. -

- First, see if it's valid UTF8, in which case there's nothing more - to be done. Next, run through the colon-separated encodings in - MONO_EXTERNAL_ENCODINGS and do an iconv conversion on each, - returning the first successful conversion to utf8. If no - conversion succeeds, return NULL. -

- Callers must free the returned string if not NULL. -

- This function is identical to mono_unicode_from_external, apart - from returning utf8 not utf16; it's handy in a few places to work - in utf8.

+
in pointer to the string buffer.
Description
+
Tries to turn a NULL-terminated string into UTF8.

First, see if it's valid UTF-8, in which case there's nothing more to be done. Next, run through the colon-separated encodings in MONO_EXTERNAL_ENCODINGS and do an iconv conversion on each, returning the first successful conversion to UTF-8. If no conversion succeeds, return NULL.

Callers must free the returned string if not NULL.

This function is identical to mono_unicode_from_external, apart from returning UTF-8 not UTF-16; it's handy in a few places to work in UTF-8.

@@ -313,7 +285,10 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_alloc
+
void* +mono_marshal_alloc (gulong size, MonoError *error) + +

@@ -328,8 +303,13 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Syntax
-
mono_marshal_asany
+
gpointer +mono_marshal_asany (MonoObject *o, MonoMarshalNative string_encoding, int param_attrs) + +

+

Description
+
This is a JIT icall, it sets the pending exception and returns NULL on error.
@@ -343,7 +323,10 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_free_array
+
void +mono_marshal_free_array (gpointer *ptr, int size) + +

@@ -358,8 +341,13 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Syntax
-
mono_marshal_free_asany
+
void +mono_marshal_free_asany (MonoObject *o, gpointer ptr, MonoMarshalNative string_encoding, int param_attrs) + +

+

Description
+
This is a JIT icall, it sets the pending exception
@@ -373,7 +361,10 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_free
+
void +mono_marshal_free (gpointer ptr) + +

@@ -403,7 +394,10 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Syntax
-
mono_marshal_get_delegate_begin_invoke
+
MonoMethod* +mono_marshal_get_delegate_begin_invoke (MonoMethod *method) + +

@@ -418,7 +412,10 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Syntax
-
mono_marshal_get_delegate_end_invoke
+
MonoMethod* +mono_marshal_get_delegate_end_invoke (MonoMethod *method) + +

@@ -433,8 +430,13 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)

Syntax
-
mono_marshal_get_delegate_invoke
+
MonoMethod* +mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del) + +

+

Description
+
The returned method invokes all methods in a multicast delegate.
@@ -448,8 +450,13 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_get_icall_wrapper
+
MonoMethod* +mono_marshal_get_icall_wrapper (MonoMethodSignature *sig, const char *name, gconstpointer func, gboolean check_exceptions) + +

+

Description
+
Generates IL code for the icall wrapper. The generated method calls the unmanaged code in func.
@@ -469,21 +476,6 @@ mono_unicode_from_external (const gchar *in, gsize *bytes) - -
-
mono_marshal_get_ldfld_remote_wrapper
-
-
-
-
- -
Syntax
-
mono_marshal_get_ldfld_remote_wrapper
-

-

-
-
-
mono_marshal_get_ldfld_wrapper
@@ -493,8 +485,14 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_get_ldfld_wrapper
+
MonoMethod* +mono_marshal_get_ldfld_wrapper (MonoType *type) + +

+

Parameters
+
type the type of the field
Description
+

This method generates a function which can be use to load a field with type type from an object. The generated function has the following signature:

type ldfld_wrapper (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, int offset)

@@ -508,8 +506,13 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
Syntax
-
mono_marshal_get_managed_wrapper
+
MonoMethod* +mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t target_handle, MonoError *error) + +

+

Description
+
Generates IL code to call managed methods from unmanaged code If target_handle is 0, the wrapper info will be a WrapperInfo structure.
@@ -529,10 +532,8 @@ mono_marshal_get_native_wrapper (MonoMethod *method, gboolean check_exceptions,

Parameters
-
method The MonoMethod to wrap.
check_exceptions Whenever to check for pending exceptions
Description
-

- generates IL code for the pinvoke wrapper (the generated method - calls the unmanaged code in piinfo->addr)

+
method The MonoMethod to wrap.
check_exceptions Whenever to check for pending exceptions
Description
+

Generates IL code for the pinvoke wrapper. The generated method calls the unmanaged code in piinfo->addr.

@@ -546,7 +547,10 @@ mono_marshal_get_native_wrapper (MonoMethod *method, gboolean check_exceptions,
Syntax
-
mono_marshal_get_proxy_cancast
+
MonoMethod* +mono_marshal_get_proxy_cancast (MonoClass *klass) + +

@@ -567,9 +571,8 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)

Parameters
-
klass
Description
-

- generates IL code for PtrToStructure (IntPtr src, object structure)

+
klass MonoClass
Description
+
Generates IL code for PtrToStructure (IntPtr src, object structure)
@@ -583,7 +586,10 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)
Syntax
-
mono_marshal_get_remoting_invoke_for_target
+
MonoMethod* +mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type) + +

@@ -598,7 +604,10 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)

Syntax
-
mono_marshal_get_remoting_invoke
+
MonoMethod* +mono_marshal_get_remoting_invoke (MonoMethod *method) + +

@@ -613,7 +622,10 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)

Syntax
-
mono_marshal_get_remoting_invoke_with_check
+
MonoMethod* +mono_marshal_get_remoting_invoke_with_check (MonoMethod *method) + +

@@ -628,8 +640,14 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)

Syntax
-
mono_marshal_get_runtime_invoke
+
MonoMethod* +mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual_) + +

+

Parameters
+
function
Description
+

MonoObject *runtime_invoke (MonoObject *this_obj, void **params, MonoObject **exc, void* method)

We also catch exceptions if exc is not NULL. If virtual is TRUE, then method is invoked virtually on this. This is useful since it means that the compiled code for method does not have to be looked up before calling the runtime invoke wrapper. In this case, the wrapper ignores its method argument.

@@ -643,22 +661,10 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)
Syntax
-
mono_marshal_get_stelemref
-

- - - +

MonoMethod* +mono_marshal_get_stelemref (void) - -
-
mono_marshal_get_stfld_remote_wrapper
-
-
-
-
- -
Syntax
-
mono_marshal_get_stfld_remote_wrapper
+

@@ -673,8 +679,14 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)
Syntax
-
mono_marshal_get_stfld_wrapper
+
MonoMethod* +mono_marshal_get_stfld_wrapper (MonoType *type) + +

+

Parameters
+
type the type of the field
Description
+

This method generates a function which can be use to store a field with type type. The generated function has the following signature:

void stfld_wrapper (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, int offset, type val)

@@ -694,9 +706,8 @@ mono_marshal_get_struct_to_ptr (MonoClass *klass)

Parameters
-
klass
Description
-

- generates IL code for StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld)

+
klass MonoClass
Description
+

Generates IL code for StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld)

@@ -710,8 +721,14 @@ mono_marshal_get_struct_to_ptr (MonoClass *klass)
Syntax
-
mono_marshal_get_synchronized_wrapper
+
MonoMethod* +mono_marshal_get_synchronized_wrapper (MonoMethod *method) + +

+

Parameters
+
wrapper the generated method
Description
+
calls method while locking this or the parent type.
@@ -725,8 +742,13 @@ mono_marshal_get_struct_to_ptr (MonoClass *klass)
Syntax
-
mono_marshal_get_unbox_wrapper
+
MonoMethod* +mono_marshal_get_unbox_wrapper (MonoMethod *method) + +

+

Description
+
The returned method calls method unboxing the this argument.
@@ -740,8 +762,13 @@ mono_marshal_get_struct_to_ptr (MonoClass *klass)
Syntax
-
mono_marshal_get_xappdomain_invoke
+
MonoMethod* +mono_marshal_get_xappdomain_invoke (MonoMethod *method) + +

+

Description
+
Generates a fast remoting wrapper for cross app domain calls.
@@ -761,12 +788,7 @@ mono_marshal_load_type_info (MonoClass* klass)

Description
-

- Initialize klass::marshal_info using information from metadata. This function can - recursively call itself, and the caller is responsible to avoid that by calling - mono_marshal_is_loading_type_info () beforehand. -

- LOCKING: Acquires the loader lock.

+

Initialize klass::marshal_info using information from metadata. This function can recursively call itself, and the caller is responsible to avoid that by calling mono_marshal_is_loading_type_info beforehand.

LOCKING: Acquires the loader lock.

@@ -780,22 +802,10 @@ mono_marshal_load_type_info (MonoClass* klass)
Syntax
-
mono_marshal_method_from_wrapper
-

- - - +

MonoMethod* +mono_marshal_method_from_wrapper (MonoMethod *wrapper) - -
-
mono_marshal_realloc
-
-
-
-
- -
Syntax
-
mono_marshal_realloc
+

@@ -816,9 +826,7 @@ mono_marshal_set_last_error (void)

Description
-

- This function is invoked to set the last error value from a P/Invoke call - which has SetLastError set.

+

This function is invoked to set the last error value from a P/Invoke call which has SetLastError set.

@@ -832,128 +840,11 @@ mono_marshal_set_last_error (void)
Syntax
-
mono_marshal_type_size
-

- - +

gint32 +mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, guint32 *align, + gboolean as_field, gboolean unicode) -

Metadata Loading Errors

- -

The routines in this section are used to cope with errors - during metadata loading. Errors in metadata handling can - happen for many reason, and these include (this is not an - exhaustive list). - -

    -
  • An assembly referenced is missing. -
  • Fields referenced are missing. -
  • Methods referenced are missing. -
- -

The mono_loader_set_* routines are invoked during - metadata loading to flag that an error has happened. The - class loading errros are flagged in a per-thread basis. - -

In various spots in the runtime the - mono_loader_get_last_error routine is called to check - if there was a problem, and then errors are propagated upwards - on the stack until we reach a point where an exception can be - raised and no runtime locks are held. - -

The mono_loader_error_prepare_exception takes a - MonoLoaderError structure (the value returned from - mono_loader_get_last_error), turns that into an - exception and clears the error condition from the current - thread. - -

- - -
-
mono_loader_set_error_field_load
-
-
-
-
- -
Syntax
-
mono_loader_set_error_field_load
-

-

-
-
- - -
-
mono_loader_set_error_method_load
-
-
-
-
- -
Syntax
-
mono_loader_set_error_method_load
-

-

-
-
- - -
-
mono_loader_set_error_type_load
-
-
-
-
- -
Syntax
-
mono_loader_set_error_type_load
-

-

-
- -
- - -
-
mono_loader_get_last_error
-
-
-
-
- -
Syntax
-
mono_loader_get_last_error
-

-

-
-
- - -
-
mono_loader_clear_error
-
-
-
-
- -
Syntax
-
mono_loader_clear_error
-

-

-
-
- - -
-
mono_loader_error_prepare_exception
-
-
-
-
- -
Syntax
-
mono_loader_error_prepare_exception
+

@@ -981,8 +872,7 @@ mono_loader_lock (void)

Description
-

- See docs/thread-safety.txt for the locking strategy.

+

See docs/thread-safety.txt for the locking strategy.

@@ -996,7 +886,10 @@ mono_loader_lock (void)
Syntax
-
mono_loader_unlock
+
void +mono_loader_unlock (void) + +

@@ -1008,66 +901,6 @@ mono_loader_lock (void) - -

-
mono_gc_disable
-
-
-
-
- -
Syntax
-
mono_gc_disable
-

-

-
-
- - -
-
mono_gc_enable
-
-
-
-
- -
Syntax
-
mono_gc_enable
-

-

-
-
- - -
-
mono_gc_start_world
-
-
-
-
- -
Syntax
-
mono_gc_start_world
-

-

-
-
- - -
-
mono_gc_stop_world
-
-
-
-
- -
Syntax
-
mono_gc_stop_world
-

-

-
-
-
mono_gc_alloc_fixed
@@ -1077,7 +910,10 @@ mono_loader_lock (void)
Syntax
-
mono_gc_alloc_fixed
+
void* +mono_gc_alloc_fixed (size_t size, MonoGCDescriptor descr, MonoGCRootSource source, const char *msg) + +

@@ -1092,7 +928,10 @@ mono_loader_lock (void)
Syntax
-
mono_gc_free_fixed
+
void +mono_gc_free_fixed (void* addr) + +

@@ -1107,7 +946,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_make_descr_from_bitmap
+
SgenDescriptor +mono_gc_make_descr_from_bitmap (gsize *bitmap, int numbits) + +

@@ -1124,7 +966,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_base_init
+
void +mono_gc_base_init (void) + +

@@ -1139,7 +984,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_invoke_finalizers
+
int +mono_gc_invoke_finalizers (void) + +

@@ -1154,7 +1002,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_is_gc_thread
+
gboolean +mono_gc_is_gc_thread (void) + +

@@ -1169,7 +1020,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_pending_finalizers
+
MonoBoolean +mono_gc_pending_finalizers (void) + +

@@ -1184,10 +1038,10 @@ mono_loader_lock (void)

Syntax
-
mono_gc_register_thread
+
gboolean +mono_gc_register_thread (void *baseptr) + +

- - - diff --git a/docs/deploy/mono-api-jit.html b/docs/deploy/mono-api-jit.html index fe395aec26..4883610f22 100644 --- a/docs/deploy/mono-api-jit.html +++ b/docs/deploy/mono-api-jit.html @@ -196,22 +196,6 @@

typedef struct _MonoJitInfo MonoJitInfo; -MonoJitInfo* mono_jit_info_table_find (MonoDomain *domain, - char *addr); -int mono_jit_info_get_code_size (MonoJitInfo* ji); -gpointer mono_jit_info_get_code_start (MonoJitInfo* ji); -MonoMethod* mono_jit_info_get_method (MonoJitInfo* ji); -G_GNUC_UNUSED char * mono_pmip (void *ip); -void mono_print_method_from_ip (void *ip); - mono_print_thread_dump -void mono_threads_request_thread_dump (void); -void mono_assemblies_init (void); -void mono_assemblies_cleanup (void); - mono_environment_exitcode_get - mono_environment_exitcode_set - mono_install_runtime_cleanup -void mono_runtime_set_shutting_down (void); - mono_security_set_core_clr_platform_callback
@@ -236,19 +220,12 @@ mono_jit_info_table_find (MonoDomain *domain, char *addr)

Parameters
-
domain Domain that you want to look up
addr Points to an address with JITed code.
Return value
-
NULL if the address does not belong to JITed code (it might be native +
domain Domain that you want to look up
addr Points to an address with JITed code.
Return value
+
NULL if the address does not belong to JITed code (it might be native - code or a trampoline) or a valid pointer to a MonoJitInfo*.
+ code or a trampoline) or a valid pointer to a MonoJitInfo* .
Description
-

- Use this function to obtain a MonoJitInfo* object that can be used to get - some statistics. You should provide both the domain on which you will be - performing the probe, and an address. Since application domains can share code - the same address can be in use by multiple domains at once. -

- This does not return any results for trampolines. -

+

Use this function to obtain a MonoJitInfo* object that can be used to get some statistics. You should provide both the domain on which you will be performing the probe, and an address. Since application domains can share code the same address can be in use by multiple domains at once.

This does not return any results for trampolines.

@@ -268,15 +245,11 @@ mono_jit_info_get_code_size (MonoJitInfo* ji)

Parameters
-
ji the JIT information handle
Return value
-
Starting address with the native code. +
ji the JIT information handle
Return value
+
Starting address with the native code.
Description
-

- Use this function to get the code size for the method described by - the ji object. You can use this plus the mono_jit_info_get_code_start - to determine the start and end of the native code. -

+

Use this function to get the code size for the method described by the ji object. You can use this plus the mono_jit_info_get_code_start to determine the start and end of the native code.

@@ -296,15 +269,11 @@ mono_jit_info_get_code_start (MonoJitInfo* ji)

Parameters
-
ji the JIT information handle
Return value
-
Starting address with the native code. +
ji the JIT information handle
Return value
+
Starting address with the native code.
Description
-

- Use this function to get the starting address for the method described by - the ji object. You can use this plus the mono_jit_info_get_code_size - to determine the start and end of the native code. -

+

Use this function to get the starting address for the method described by the ji object. You can use this plus the mono_jit_info_get_code_size to determine the start and end of the native code.

@@ -324,15 +293,12 @@ mono_jit_info_get_method (MonoJitInfo* ji)

Parameters
-
ji the JIT information handle
Return value
-
The MonoMethod that represents the code tracked +
ji the JIT information handle
Return value
+
The MonoMethod that represents the code tracked by ji.
Description
-

- Use this function to get the `MonoMethod *` that backs - the ji object. -

+

Use this function to get the MonoMethod* that backs the ji object.

@@ -358,17 +324,11 @@ mono_pmip (void *ip)

Parameters
-
ip an instruction pointer address
Return value
-
the name of the method at address ip. +
ip an instruction pointer address
Return value
+
the name of the method at address ip.
Description
-

- This method is used from a debugger to get the name of the - method at address ip. This routine is typically invoked from - a debugger like this: -

- (gdb) print mono_pmip ($pc) -

+

This method is used from a debugger to get the name of the method at address ip. This routine is typically invoked from a debugger like this:

(gdb) print mono_pmip ($pc)

@@ -382,24 +342,14 @@ mono_pmip (void *ip)
Syntax
-
#ifdef __GNUC__ -/* Prevent the linker from optimizing this away in embedding setups to help debugging */ - __attribute__ ((__used__)) -#endif -void +
MONO_ATTR_USED void mono_print_method_from_ip (void *ip)

Parameters
-
ip an instruction pointer address
Description
-

- This method is used from a debugger to get the name of the - method at address ip. -

- This prints the name of the method at address ip in the standard - output. Unlike mono_pmip which returns a string, this routine - prints the value on the standard output.

+
ip an instruction pointer address
Description
+

This method is used from a debugger to get the name of the method at address ip.

This prints the name of the method at address ip in the standard output. Unlike mono_pmip which returns a string, this routine prints the value on the standard output.

@@ -413,8 +363,13 @@ mono_print_method_from_ip (void *ip)
Syntax
-
mono_print_thread_dump
+
void +mono_print_thread_dump (void *sigctx) + +

+

Description
+

Print information about the current thread to stdout. sigctx can be NULL, allowing this to be called from gdb.

@@ -434,8 +389,7 @@ mono_threads_request_thread_dump (void)

Description
-

- Ask all threads except the current to print their stacktrace to stdout.

+

Ask all threads except the current to print their stacktrace to stdout.

@@ -458,8 +412,7 @@ mono_assemblies_init (void)

Description
-

- Initialize global variables used by this module.

+

Initialize global variables used by this module.

@@ -479,8 +432,7 @@ mono_assemblies_cleanup (void)

Description
-

- Free all resources used by this module.

+

Free all resources used by this module.

@@ -494,7 +446,10 @@ mono_assemblies_cleanup (void)
Syntax
-
mono_environment_exitcode_get
+
gint32 +mono_environment_exitcode_get (void) + +

@@ -509,7 +464,10 @@ mono_assemblies_cleanup (void)

Syntax
-
mono_environment_exitcode_set
+
void +mono_environment_exitcode_set (gint32 value) + +

@@ -524,7 +482,10 @@ mono_assemblies_cleanup (void)

Syntax
-
mono_install_runtime_cleanup
+
void +mono_install_runtime_cleanup (MonoDomainFunc func) + +

@@ -532,7 +493,7 @@ mono_assemblies_cleanup (void)

-
mono_runtime_set_shutting_down
+
mono_runtime_set_shutting_down

Deprecated: This function can break the shutdown sequence.
@@ -545,13 +506,6 @@ mono_runtime_set_shutting_down (void)

Description
-

- Invoked by System.Environment.Exit to flag that the runtime - is shutting down. -

- Deprecated. This function can break the shutdown sequence.

+

Invoked by System.Environment.Exit to flag that the runtime is shutting down.

- - - diff --git a/docs/deploy/mono-api-jitinternal.html b/docs/deploy/mono-api-jitinternal.html index 4c9317f922..b401a56ed4 100644 --- a/docs/deploy/mono-api-jitinternal.html +++ b/docs/deploy/mono-api-jitinternal.html @@ -200,7 +200,10 @@
Syntax
-
mono_sha1_init
+
void +mono_sha1_init (MonoSHA1Context* context) + +

@@ -215,7 +218,10 @@

Syntax
-
mono_sha1_update
+
void +mono_sha1_update (MonoSHA1Context* context, const guchar* data, guint32 len) + +

@@ -230,8 +236,14 @@

Syntax
-
mono_sha1_get_digest_from_file
+
void +mono_sha1_get_digest_from_file (const gchar *filename, guchar digest [20]) + +

+

Parameters
+
filename file name
digest 20-byte buffer receiving the hash code.
Description
+

Get the SHA-1 hash of a file. The result is put in the 20-byte buffer digest.

If an IO error happens the value in digest is not updated.

@@ -245,7 +257,10 @@
Syntax
-
mono_sha1_get_digest
+
void +mono_sha1_get_digest (const guchar *buffer, gint buffer_size, guchar digest [20]) + +

@@ -260,7 +275,10 @@

Syntax
-
mono_sha1_final
+
void +mono_sha1_final (MonoSHA1Context* context, unsigned char digest[20]) + +

@@ -278,7 +296,10 @@

Syntax
-
mono_md5_init
+
void +mono_md5_init (MonoMD5Context *ctx) + +

@@ -293,7 +314,10 @@

Syntax
-
mono_md5_update
+
void +mono_md5_update (MonoMD5Context *ctx, const guchar *buf, guint32 len) + +

@@ -308,8 +332,14 @@

Syntax
-
mono_md5_get_digest_from_file
+
void +mono_md5_get_digest_from_file (const gchar *filename, guchar digest[16]) + +

+

Parameters
+
filename file name
digest 16-byte buffer receiving the hash code.
Description
+

Get the MD5 hash of a file. The result is put in the 16-byte buffer digest.

If an IO error happens the value in digest is not updated.

@@ -323,8 +353,14 @@
Syntax
-
mono_md5_get_digest
+
void +mono_md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]) + +

+

Parameters
+
buffer byte buffer
buffer_size buffer size (in bytes)
digest 16-byte buffer receiving the hash code.
Description
+

Get the MD5 hash of a buffer. The result is put in the 16-byte buffer digest.

@@ -338,7 +374,10 @@
Syntax
-
mono_md5_final
+
void +mono_md5_final (MonoMD5Context *ctx, guchar digest[16]) + +

@@ -354,8 +393,13 @@

Syntax
-
mono_digest_get_public_token
+
void +mono_digest_get_public_token (guchar* token, const guchar *pubkey, guint32 len) + +

+

Description
+

Get the public token from public key data. token must point to at least 8 bytes of storage.

@@ -380,7 +424,10 @@
Syntax
-
mono_g_hash_table_destroy
+
void +mono_g_hash_table_destroy (MonoGHashTable *hash) + +

@@ -395,7 +442,10 @@

Syntax
-
mono_g_hash_table_foreach
+
void +mono_g_hash_table_foreach (MonoGHashTable *hash, GHFunc func, gpointer user_data) + +

@@ -410,22 +460,10 @@

Syntax
-
mono_g_hash_table_foreach_remove
-

- - - +

guint +mono_g_hash_table_foreach_remove (MonoGHashTable *hash, GHRFunc func, gpointer user_data) - -
-
mono_g_hash_table_foreach_steal
-
-
-
-
- -
Syntax
-
mono_g_hash_table_foreach_steal
+

@@ -440,7 +478,10 @@
Syntax
-
mono_g_hash_table_insert
+
void +mono_g_hash_table_insert (MonoGHashTable *h, gpointer k, gpointer v) + +

@@ -455,7 +496,10 @@
Syntax
-
mono_g_hash_table_lookup
+
gpointer +mono_g_hash_table_lookup (MonoGHashTable *hash, gconstpointer key) + +

@@ -470,52 +514,10 @@

Syntax
-
mono_g_hash_table_lookup_extended
-

- - - +

gboolean +mono_g_hash_table_lookup_extended (MonoGHashTable *hash, gconstpointer key, gpointer *orig_key, gpointer *value) - -
-
mono_g_hash_table_new
-
-
-
-
- -
Syntax
-
mono_g_hash_table_new
-

-

-
-
- - -
-
mono_g_hash_table_new_full
-
-
-
-
- -
Syntax
-
mono_g_hash_table_new_full
-

-

-
-
- - -
-
mono_g_hash_table_remap
-
-
-
-
- -
Syntax
-
mono_g_hash_table_remap
+

@@ -530,7 +532,10 @@
Syntax
-
mono_g_hash_table_remove
+
gboolean +mono_g_hash_table_remove (MonoGHashTable *hash, gconstpointer key) + +

@@ -545,7 +550,10 @@
Syntax
-
mono_g_hash_table_replace
+
void +mono_g_hash_table_replace(MonoGHashTable *h, gpointer k, gpointer v) + +

@@ -560,22 +568,10 @@

Syntax
-
mono_g_hash_table_size
-

- - - +

guint +mono_g_hash_table_size (MonoGHashTable *hash) - -
-
mono_g_hash_table_steal
-
-
-
-
- -
Syntax
-
mono_g_hash_table_steal
+

@@ -617,10 +613,10 @@ mono_mempool_new (void)

Return value
-
a new memory pool. +
a new memory pool.
Description
-

+

@@ -640,9 +636,8 @@ mono_mempool_destroy (MonoMemPool *pool)

Parameters
-
pool the memory pool to destroy
Description
-

- Free all memory associated with this pool.

+
pool the memory pool to destroy
Description
+

Free all memory associated with this pool.

@@ -662,13 +657,11 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)

Parameters
-
pool the memory pool to use
size size of the memory block
Return value
-
the address of a newly allocated memory block. +
pool the memory pool to use
size size of the memory block
Return value
+
the address of a newly allocated memory block.
Description
-

- Allocates a new block of memory in pool. -

+

Allocates a new block of memory in pool .

@@ -688,23 +681,7 @@ mono_mempool_alloc0 (MonoMemPool *pool, guint size)

Description
-

- same as mono_mempool_alloc, but fills memory with zero.

- - - - - -
-
mono_mempool_empty
-
-
-
-
- -
Syntax
-
mono_mempool_empty
-

+

same as mono_mempool_alloc, but fills memory with zero.

@@ -724,9 +701,8 @@ mono_mempool_invalidate (MonoMemPool *pool)

Parameters
-
pool the memory pool to invalidate
Description
-

- Fill the memory associated with this pool to 0x2a (42). Useful for debugging.

+
pool the memory pool to invalidate
Description
+

Fill the memory associated with this pool to 0x2a (42). Useful for debugging.

@@ -746,12 +722,8 @@ mono_mempool_stats (MonoMemPool *pool)

Parameters
-
pool the momory pool we need stats for
Description
-

- Print a few stats about the mempool: - - Total memory allocated (malloced) by mem pool - - Number of chunks/blocks memory is allocated in - - How much memory is available to dispense before a new malloc must occur?

+
pool the memory pool we need stats for
Description
+

Print a few stats about the mempool: - Total memory allocated (malloced) by mem pool - Number of chunks/blocks memory is allocated in - How much memory is available to dispense before a new malloc must occur?

@@ -772,8 +744,7 @@ mono_mempool_contains_addr (MonoMemPool *pool,

Description
-

- Determines whenever ADDR is inside the memory used by the mempool.

+

Determines whether addr is inside the memory used by the mempool.

@@ -793,8 +764,16 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_alloc_size
+
guint32 +mono_bitset_alloc_size (guint32 max_size, guint32 flags) +

+

Parameters
+
max_size The number of bits you want to hold
flags unused
Return value
+
the number of bytes required to hold the bitset. + + Useful to allocate it on the stack or with mempool. + Use with mono_bitset_mem_new.
@@ -808,8 +787,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_clear
+
void +mono_bitset_clear (MonoBitSet *set, guint32 pos) +

+

Parameters
+
set bitset ptr
pos unset bit at this pos
Description
+

Unset bit at pos, counting from 0.

@@ -823,8 +807,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_clear_all
+
void +mono_bitset_clear_all (MonoBitSet *set) +

+

Parameters
+
set bitset ptr
Description
+

Unset all bits.

@@ -838,8 +827,16 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_clone
+
MonoBitSet* +mono_bitset_clone (const MonoBitSet *set, guint32 new_size) +

+

Parameters
+
set bitset ptr to clone
new_size number of bits the cloned bitset can hold
Return value
+
a cloned bitset of size new_size. MONO_BITSET_DONT_FREE + + unset in cloned bitset. If new_size is 0, the cloned object is just + as big.
@@ -853,8 +850,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_copyto
+
void +mono_bitset_copyto (const MonoBitSet *src, MonoBitSet *dest) +

+

Parameters
+
src bitset ptr to copy from
dest bitset ptr to copy to
Description
+

Copy one bitset to another.

@@ -868,8 +870,14 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_count
+
guint32 +mono_bitset_count (const MonoBitSet *set) +

+

Parameters
+
set bitset ptr
Return value
+
number of bits that are set. +
@@ -883,8 +891,15 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_equal
+
gboolean +mono_bitset_equal (const MonoBitSet *src, const MonoBitSet *src1) +

+

Parameters
+
src bitset ptr
src1 bitset ptr
Return value
+
TRUE if their size are the same and the same bits are set in + + both bitsets.
@@ -898,8 +913,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_find_first
+
int +mono_bitset_find_first (const MonoBitSet *set, gint pos) +

+

Parameters
+
set bitset ptr
pos pos to search after (not including)
Return value
+
position of first set bit after pos. If pos -1 if no bit set is found.
@@ -913,8 +933,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_find_last
+
int +mono_bitset_find_last (const MonoBitSet *set, gint pos) +

+

Parameters
+
set bitset ptr
pos pos to search before (not including)
Return value
+
position of last set bit before pos. If pos -1 if no set bit is found.
@@ -928,8 +953,14 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_find_start
+
int +mono_bitset_find_start (const MonoBitSet *set) + +

+

Parameters
+
set bitset ptr
Description
+
Equivalent to mono_bitset_find_first (set, -1) but faster.
@@ -943,8 +974,14 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_foreach
+
void +mono_bitset_foreach (MonoBitSet *set, MonoBitSetFunc func, gpointer data) + +

+

Parameters
+
set bitset ptr
func Function to call for every set bit
data pass this as second arg to func
Description
+
Calls func for every bit set in bitset. Argument 1 is the number of the bit set, argument 2 is data
@@ -973,8 +1010,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_intersection
+
void +mono_bitset_intersection (MonoBitSet *dest, const MonoBitSet *src) +

+

Parameters
+
dest bitset ptr to hold intersection
src bitset ptr to copy
Description
+

Make intersection of one bitset and another.

@@ -988,8 +1030,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_invert
+
void +mono_bitset_invert (MonoBitSet *set) +

+

Parameters
+
set bitset ptr
Description
+

Flip all bits.

@@ -1003,8 +1050,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_mem_new
+
MonoBitSet* +mono_bitset_mem_new (gpointer mem, guint32 max_size, guint32 flags) +

+

Parameters
+
mem The location the bitset is stored
max_size The number of bits you want to hold
flags bitfield of flags
Description
+

Return mem, which is now a initialized bitset of size max_size. It is not freed even if called with mono_bitset_free. mem must be at least as big as mono_bitset_alloc_size returns for the same max_size.

@@ -1018,8 +1070,15 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_new
+
MonoBitSet* +mono_bitset_new (guint32 max_size, guint32 flags) +

+

Parameters
+
max_size The numer of bits you want to hold
flags bitfield of flags
Return value
+
a bitset of size max_size. It must be freed using + + mono_bitset_free.
@@ -1033,8 +1092,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_set
+
void +mono_bitset_set (MonoBitSet *set, guint32 pos) +

+

Parameters
+
set bitset ptr
pos set bit at this pos
Description
+

Set bit at pos, counting from 0.

@@ -1048,8 +1112,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_set_all
+
void +mono_bitset_set_all (MonoBitSet *set) +

+

Parameters
+
set bitset ptr
Description
+

Set all bits.

@@ -1063,8 +1132,14 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_size
+
guint32 +mono_bitset_size (const MonoBitSet *set) +

+

Parameters
+
set bitset ptr
Return value
+
the number of bits this bitset can hold. +
@@ -1078,8 +1153,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_sub
+
void +mono_bitset_sub (MonoBitSet *dest, const MonoBitSet *src) +

+

Parameters
+
dest bitset ptr to hold bitset - src
src bitset ptr to copy
Description
+

Unset all bits in dest that are set in src.

@@ -1093,8 +1173,16 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_test
+
int +mono_bitset_test (const MonoBitSet *set, guint32 pos) +

+

Parameters
+
set bitset ptr
pos test bit at this pos
Return value
+
a nonzero value if set, 0 otherwise. +
+
Description
+
Test bit at pos, counting from 0.
@@ -1108,8 +1196,15 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_test_bulk
+
gsize +mono_bitset_test_bulk (const MonoBitSet *set, guint32 pos) +

+

Parameters
+
set bitset ptr
pos test bit at this pos
Return value
+
32/64 bits from the bitset, starting from pos, which must be + + divisible with 32/64.
@@ -1123,8 +1218,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_union
+
void +mono_bitset_union (MonoBitSet *dest, const MonoBitSet *src) +

+

Parameters
+
dest bitset ptr to hold union
src bitset ptr to copy
Description
+

Make union of one bitset and another.

@@ -1138,8 +1238,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_find_first_unset
+
int +mono_bitset_find_first_unset (const MonoBitSet *set, gint pos) +

+

Parameters
+
set bitset ptr
pos pos to search after (not including)
Return value
+
position of first unset bit after pos. If pos -1 if no bit set is found.
@@ -1153,8 +1258,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_bitset_intersection_2
+
void +mono_bitset_intersection_2 (MonoBitSet *dest, const MonoBitSet *src1, const MonoBitSet *src2) +

+

Parameters
+
dest bitset ptr to hold intersection
src1 first bitset
src2 second bitset
Description
+

Make intersection of two bitsets

@@ -1171,7 +1281,10 @@ mono_mempool_contains_addr (MonoMemPool *pool,
Syntax
-
mono_signbit_double
+
int +mono_signbit_double (double x) + +

@@ -1186,7 +1299,10 @@ mono_mempool_contains_addr (MonoMemPool *pool,

Syntax
-
mono_signbit_float
+
int +mono_signbit_float (float x) + +

@@ -1210,8 +1326,13 @@ mono_mempool_contains_addr (MonoMemPool *pool,

Syntax
-
mono_create_ftnptr
+
gpointer +mono_create_ftnptr (MonoDomain *domain, gpointer addr) + +

+

Description
+

Given a function address, create a function descriptor for it. This is only needed on some platforms.

@@ -1245,13 +1366,8 @@ mono_profiler_load (const char *desc)

Parameters
-
desc arguments to configure the profiler
Description
-

- Invoke this method to initialize the profiler. This will drive the - loading of the internal ("default") or any external profilers. -

- This routine is invoked by Mono's driver, but must be called manually - if you embed Mono into your application.

+
desc arguments to configure the profiler
Description
+

Invoke this method to initialize the profiler. This will drive the loading of the internal ("default") or any external profilers.

This routine is invoked by Mono's driver, but must be called manually if you embed Mono into your application.

@@ -1265,7 +1381,10 @@ mono_profiler_load (const char *desc)
Syntax
-
mono_profiler_allocation
+
void +mono_profiler_allocation (MonoObject *obj) + +

@@ -1280,7 +1399,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_stat_hit
+
void +mono_profiler_stat_hit (guchar *ip, void *context) + +

@@ -1295,7 +1417,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_thread_start
+
void +mono_profiler_thread_start (gsize tid) + +

@@ -1310,7 +1435,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_thread_end
+
void +mono_profiler_thread_end (gsize tid) + +

@@ -1325,7 +1453,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_appdomain_event
+
void +mono_profiler_appdomain_event (MonoDomain *domain, int code) + +

@@ -1340,7 +1471,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_appdomain_loaded
+
void +mono_profiler_appdomain_loaded (MonoDomain *domain, int result) + +

@@ -1355,7 +1489,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_assembly_event
+
void +mono_profiler_assembly_event (MonoAssembly *assembly, int code) + +

@@ -1370,7 +1507,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_assembly_loaded
+
void +mono_profiler_assembly_loaded (MonoAssembly *assembly, int result) + +

@@ -1385,7 +1525,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_class_event
+
void +mono_profiler_class_event (MonoClass *klass, int code) + +

@@ -1400,7 +1543,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_class_loaded
+
void +mono_profiler_class_loaded (MonoClass *klass, int result) + +

@@ -1415,7 +1561,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_code_transition
+
void +mono_profiler_code_transition (MonoMethod *method, int result) + +

@@ -1430,7 +1579,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_method_end_jit
+
void +mono_profiler_method_end_jit (MonoMethod *method, MonoJitInfo* jinfo, int result) + +

@@ -1445,7 +1597,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_method_enter
+
void +mono_profiler_method_enter (MonoMethod *method) + +

@@ -1460,7 +1615,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_method_jit
+
void +mono_profiler_method_jit (MonoMethod *method) + +

@@ -1475,7 +1633,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_method_leave
+
void +mono_profiler_method_leave (MonoMethod *method) + +

@@ -1490,7 +1651,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_module_event
+
void +mono_profiler_module_event (MonoImage *module, int code) + +

@@ -1505,7 +1669,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_module_loaded
+
void +mono_profiler_module_loaded (MonoImage *module, int result) + +

@@ -1520,7 +1687,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_shutdown
+
void +mono_profiler_shutdown (void) + +

@@ -1535,8 +1705,13 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_startup
+
void +mono_profiler_startup (const char *desc) + +

+

Description
+
the entry point
@@ -1550,7 +1725,10 @@ mono_profiler_load (const char *desc)
Syntax
-
mono_profiler_gc_event
+
void +mono_profiler_gc_event (MonoGCEvent event, int generation) + +

@@ -1565,40 +1743,10 @@ mono_profiler_load (const char *desc)

Syntax
-
mono_profiler_gc_heap_resize
+
void +mono_profiler_gc_heap_resize (gint64 new_size) + +

- - - -

-
mono_profiler_gc_event
-
-
-
-
- -
Syntax
-
mono_profiler_gc_event
-

-

-
-
- - -
-
mono_profiler_gc_heap_resize
-
-
-
-
- -
Syntax
-
mono_profiler_gc_heap_resize
-

-

-
-
- - diff --git a/docs/deploy/mono-api-metadata.html b/docs/deploy/mono-api-metadata.html index 80f72c5c3d..832d6707e1 100644 --- a/docs/deploy/mono-api-metadata.html +++ b/docs/deploy/mono-api-metadata.html @@ -249,11 +249,9 @@ mono_metadata_guid_heap (MonoImage *meta, guint32 index)

Parameters
-
meta metadata context
index index into the guid heap.
Return value
-
an in-memory pointer to the index in the guid heap. +
meta metadata context
index index into the guid heap.
Return value
+
an in-memory pointer to the index in the guid heap.
-
Description
-

@@ -273,11 +271,9 @@ mono_metadata_string_heap (MonoImage *meta, guint32 index)

Parameters
-
meta metadata context
index index into the string heap.
Return value
-
an in-memory pointer to the index in the string heap. +
meta metadata context
index index into the string heap.
Return value
+
an in-memory pointer to the index in the string heap.
-
Description
-

@@ -297,11 +293,9 @@ mono_metadata_blob_heap (MonoImage *meta, guint32 index)

Parameters
-
meta metadata context
index index into the blob.
Return value
-
an in-memory pointer to the index in the Blob heap. +
meta metadata context
index index into the blob.
Return value
+
an in-memory pointer to the index in the Blob heap.
-
Description
-

@@ -321,11 +315,9 @@ mono_metadata_user_string (MonoImage *meta, guint32 index)

Parameters
-
meta metadata context
index index into the user string heap.
Return value
-
an in-memory pointer to the index in the user string heap ("US"). +
meta metadata context
index index into the user string heap.
Return value
+
an in-memory pointer to the index in the user string heap (US).
-
Description
-

@@ -345,13 +337,11 @@ mono_metadata_decode_blob_size (const char *xptr, const char **rptr)

Parameters
-
ptr pointer to a blob object
rptr the new position of the pointer
Return value
-
the size of the blob object +
ptr pointer to a blob object
rptr the new position of the pointer
Return value
+
the size of the blob object
Description
-

- This decodes a compressed size as described by 23.1.4 (a blob or user string object) -

+

This decodes a compressed size as described by 23.1.4 (a blob or user string object)

@@ -930,7 +920,10 @@ MONO_TYPESPEC_SIZE
Syntax
-
mono_image_get_table_info
+
const MonoTableInfo* +mono_image_get_table_info (MonoImage *image, int table_id) + +

@@ -945,7 +938,10 @@ MONO_TYPESPEC_SIZE

Syntax
-
mono_image_get_table_rows
+
int +mono_image_get_table_rows (MonoImage *image, int table_id) + +

@@ -966,10 +962,8 @@ mono_metadata_decode_row_col (const MonoTableInfo *t, int idx, guint col)

Parameters
-
t table to extract information from.
idx index for row in table.
col column in the row.
Description
-

- This function returns the value of column col from the idx - row in the table t.

+
t table to extract information from.
idx index for row in table.
col column in the row.
Description
+

This function returns the value of column col from the idx row in the table t .

@@ -989,10 +983,8 @@ mono_metadata_decode_row (const MonoTableInfo *t, int idx, guint32 *res, int res

Parameters
-
t table to extract information from.
idx index in table.
res array of res_size cols to store the results in
Description
-

- This decompresses the metadata element idx in table t - into the guint32 res array that has res_size elements

+
t table to extract information from.
idx index in table.
res array of res_size cols to store the results in
Description
+

This decompresses the metadata element idx in table t into the guint32 res array that has res_size elements

@@ -1006,8 +998,14 @@ mono_metadata_decode_row (const MonoTableInfo *t, int idx, guint32 *res, int res
Syntax
-
mono_metadata_compute_size
+
int +mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bitfield) + +

+

Parameters
+
meta metadata context
tableindex metadata table number
result_bitfield pointer to guint32 where to store additional info
Description
+

mono_metadata_compute_size computes the length in bytes of a single row in a metadata table. The size of each column is encoded in the result_bitfield return value along with the number of columns in the table. the resulting bitfield should be handed to the mono_metadata_table_size and mono_metadata_table_count macros. This is a Mono runtime internal only function.

@@ -1021,8 +1019,14 @@ mono_metadata_decode_row (const MonoTableInfo *t, int idx, guint32 *res, int res
Syntax
-
mono_metadata_custom_attrs_from_index
+
guint32 +mono_metadata_custom_attrs_from_index (MonoImage *meta, guint32 index) + +

+

Parameters
+
meta metadata context
index token representing the parent
returns the 1-based index into the CustomAttribute table of the first
Description
+
attribute which belongs to the metadata object described by index. Returns 0 if no such attribute is found.
@@ -1042,14 +1046,11 @@ mono_metadata_decode_signed_value (const char *ptr, const char **rptr)

Parameters
-
ptr pointer to decode from
rptr the new position of the pointer
Return value
-
the decoded value +
ptr pointer to decode from
rptr the new position of the pointer
Return value
+
the decoded value
Description
-

- This routine decompresses 32-bit signed values - (not specified in the spec) -

+

This routine decompresses 32-bit signed values (not specified in the spec)

@@ -1069,14 +1070,11 @@ mono_metadata_decode_value (const char *_ptr, const char **rptr)

Parameters
-
ptr pointer to decode from
rptr the new position of the pointer
Return value
-
the decoded value +
ptr pointer to decode from
rptr the new position of the pointer
Return value
+
the decoded value
Description
-

- This routine decompresses 32-bit values as specified in the "Blob and - Signature" section (23.2) -

+

This routine decompresses 32-bit values as specified in the "Blob and Signature" section (23.2)

@@ -1117,15 +1115,13 @@ mono_pe_file_open (const char *fname, MonoImageOpenStatus *status)

Parameters
-
fname filename that points to the module we want to open
status An error condition is returned in this field
Return value
-
An open image of type %MonoImage or NULL on error. if +
fname filename that points to the module we want to open
status An error condition is returned in this field
Return value
+
An open image of type MonoImage or NULL on error. if NULL, then check the value of status for details on the error. - This variant for mono_image_open DOES NOT SET UP CLI METADATA. - It's just a PE file loader, used for FileVersionInfo. It also does + This variant for mono_image_open DOES NOT SET UP CLI METADATA. + It's just a PE file loader, used for FileVersionInfo. It also does not use the image cache.
-
Description
-

@@ -1139,8 +1135,17 @@ mono_pe_file_open (const char *fname, MonoImageOpenStatus *status)
Syntax
-
mono_metadata_events_from_typedef
+
guint32 +mono_metadata_events_from_typedef (MonoImage *meta, guint32 index, guint *end_idx) + +

+

Parameters
+
meta metadata context
index 0-based index (in the TypeDef table) describing a type
Return value
+
the 0-based index in the Event table for the events in the + + type. The last event that belongs to the type (plus 1) is stored + in the end_idx pointer.
@@ -1160,11 +1165,7 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r

Description
-

- Same as mono_metadata_decode_row, but takes an IMAGE+TABLE ID pair, and takes - uncompressed metadata into account, so it should be used to access the - Method, Field, Param and Event tables when the access is made from metadata, i.e. - IDX is retrieved from a metadata table, like MONO_TYPEDEF_FIELD_LIST.

+

Same as mono_metadata_decode_row, but takes an image + table ID pair, and takes uncompressed metadata into account, so it should be used to access the Method, Field, Param and Event tables when the access is made from metadata, i.e. idx is retrieved from a metadata table, like MONO_TYPEDEF_FIELD_LIST.

@@ -1183,10 +1184,7 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r

Description
-

- Same as mono_metadata_decode_row_col, but takes an IMAGE+TABLE ID pair, and takes - uncompressed metadata into account, so it should be used to access the - Method, Field, Param and Event tables.

+

Same as mono_metadata_decode_row_col, but takes an image + table ID pair, and takes uncompressed metadata into account, so it should be used to access the Method, Field, Param and Event tables.

@@ -1200,8 +1198,15 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_field_info
+
void +mono_metadata_field_info (MonoImage *meta, guint32 index, guint32 *offset, guint32 *rva, + MonoMarshalSpec **marshal_spec) + +

+

Parameters
+
meta the Image the field is defined in
index the index in the field table representing the field
offset a pointer to an integer where to store the offset that may have been specified for the field in a FieldLayout table
rva a pointer to the RVA of the field data in the image that may have been defined in a FieldRVA table
marshal_spec a pointer to the marshal spec that may have been defined for the field in a FieldMarshal table.
Description
+

Gather info for field index that may have been defined in the FieldLayout, FieldRVA and FieldMarshal tables. Either of offset, rva and marshal_spec can be NULL if you're not interested in the data.

@@ -1215,8 +1220,14 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_free_array
+
void +mono_metadata_free_array (MonoArrayType *array) + +

+

Parameters
+
array array description
Description
+

Frees the array description returned from mono_metadata_parse_array.

@@ -1230,7 +1241,10 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_free_marshal_spec
+
void +mono_metadata_free_marshal_spec (MonoMarshalSpec *spec) + +

@@ -1245,8 +1259,14 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r

Syntax
-
mono_metadata_free_mh
+
void +mono_metadata_free_mh (MonoMethodHeader *mh) + +

+

Parameters
+
mh a method header
Description
+

Free the memory allocated for the method header.

@@ -1260,8 +1280,14 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_free_type
+
void +mono_metadata_free_type (MonoType *type) + +

+

Parameters
+
type type to free
Description
+

Free the memory allocated for type type which is allocated on the heap.

@@ -1275,8 +1301,17 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_get_constant_index
+
guint32 +mono_metadata_get_constant_index (MonoImage *meta, guint32 token, guint32 hint) + +

+

Parameters
+
meta the Image the field is defined in
index the token that may have a row defined in the constants table
hint possible position for the row
Return value
+
the index into the Constants table or 0 if not found. +
+
Description
+

token must be a FieldDef, ParamDef or PropertyDef token.

@@ -1290,7 +1325,10 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r
Syntax
-
mono_metadata_get_marshal_info
+
const char* +mono_metadata_get_marshal_info (MonoImage *meta, guint32 idx, gboolean is_field) + +

@@ -1305,7 +1343,10 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r

Syntax
-
mono_metadata_implmap_from_method
+
guint32 +mono_metadata_implmap_from_method (MonoImage *meta, guint32 method_idx) + +

@@ -1320,8 +1361,17 @@ mono_metadata_decode_table_row (MonoImage *image, int table, int idx, guint32 *r

Syntax
-
mono_metadata_interfaces_from_typedef
+
MonoClass* +mono_metadata_interfaces_from_typedef (MonoImage *meta, guint32 index, guint *count) + +

+

Parameters
+
meta metadata context
index typedef token
count Out parameter used to store the number of interfaces
Return value
+
the interface array on success, NULL on failure. +
+
Description
+

The array of interfaces that the index typedef token implements is returned in interfaces. The number of elements in the array is returned in count. The returned array is allocated with g_malloc and the caller must free it.

LOCKING: Acquires the loader lock .

@@ -1341,12 +1391,12 @@ mono_metadata_locate (MonoImage *meta, int table, int idx)

Parameters
-
meta metadata context
table table code.
idx index of element to retrieve from table.
Return value
-
a pointer to the idx element in the metadata table +
meta metadata context
table table code.
idx index of element to retrieve from table.
Return value
+
a pointer to the idx element in the metadata table whose code is table.
Description
-

+

@@ -1366,12 +1416,12 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)

Parameters
-
meta metadata context
token metadata token
Return value
-
a pointer to the data in the metadata represented by the +
meta metadata context
token metadata token
Return value
+
a pointer to the data in the metadata represented by the - token token.
+ token token .
Description
-

+

@@ -1385,8 +1435,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_methods_from_event
+
guint32 +mono_metadata_methods_from_event (MonoImage *meta, guint32 index, guint *end_idx) + +

+

Parameters
+
meta metadata context
index 0-based index (in the Event table) describing a event
Return value
+
the 0-based index in the MethodDef table for the methods in the + + event. The last method that belongs to the event (plus 1) is stored + in the end_idx pointer.
@@ -1400,8 +1459,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_methods_from_property
+
guint32 +mono_metadata_methods_from_property (MonoImage *meta, guint32 index, guint *end_idx) + +

+

Parameters
+
meta metadata context
index 0-based index (in the PropertyDef table) describing a property
Return value
+
the 0-based index in the MethodDef table for the methods in the + + property. The last method that belongs to the property (plus 1) is stored + in the end_idx pointer.
@@ -1415,8 +1483,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_nested_in_typedef
+
guint32 +mono_metadata_nested_in_typedef (MonoImage *meta, guint32 index) + +

+

Parameters
+
meta metadata context
index typedef token
Return value
+
the 1-based index into the TypeDef table of the type + + where the type described by index is nested. + Returns 0 if index describes a non-nested type.
@@ -1430,8 +1507,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_nesting_typedef
+
guint32 +mono_metadata_nesting_typedef (MonoImage *meta, guint32 index, guint32 start_index) + +

+

Parameters
+
meta metadata context
index typedef token
Return value
+
the 1-based index into the TypeDef table of the first type + + that is nested inside the type described by index. The search starts at + start_index. Returns 0 if no such type is found.
@@ -1445,8 +1531,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_packing_from_typedef
+
guint32 +mono_metadata_packing_from_typedef (MonoImage *meta, guint32 index, guint32 *packing, guint32 *size) + +

+

Parameters
+
meta metadata context
index token representing a type
Return value
+
the info stored in the ClassLayout table for the given typedef token + + into the packing and size pointers. + Returns 0 if the info is not found.
@@ -1460,8 +1555,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_properties_from_typedef
+
guint32 +mono_metadata_properties_from_typedef (MonoImage *meta, guint32 index, guint *end_idx) + +

+

Parameters
+
meta metadata context
index 0-based index (in the TypeDef table) describing a type
Return value
+
the 0-based index in the Property table for the properties in the + + type. The last property that belongs to the type (plus 1) is stored + in the end_idx pointer.
@@ -1475,8 +1579,17 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_token_from_dor
+
guint32 +mono_metadata_token_from_dor (guint32 dor_index) + +

+

Parameters
+
dor_token A TypeDefOrRef coded index
Return value
+
an expanded token +
+
Description
+

dor_token is a TypeDefOrRef coded index: it contains either a TypeDef, TypeRef or TypeSpec in the lower bits, and the upper bits contain an index into the table.

@@ -1490,8 +1603,13 @@ mono_metadata_locate_token (MonoImage *meta, guint32 token)
Syntax
-
mono_metadata_translate_token_index
+
guint32 +mono_metadata_translate_token_index (MonoImage *image, int table, guint32 idx) + +

+

Description
+
Translates the given 1-based index into the Method, Field, Event, or Param tables using the *Ptr tables in uncompressed metadata, if they are available.

FIXME: The caller is not forced to call this function, which is error-prone, since forgetting to call it would only show up as a bug on uncompressed metadata.

@@ -1511,12 +1629,12 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)

Parameters
-
meta metadata context
index FieldDef token
Return value
-
the 1-based index into the TypeDef table of the type that +
meta metadata context
index FieldDef token
Return value
+
the 1-based index into the TypeDef table of the type that declared the field described by index, or 0 if not found.
Description
-

+

@@ -1530,8 +1648,16 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
Syntax
-
mono_metadata_typedef_from_method
+
guint32 +mono_metadata_typedef_from_method (MonoImage *meta, guint32 index) + +

+

Parameters
+
meta metadata context
index MethodDef token
Return value
+
the 1-based index into the TypeDef table of the type that + + declared the method described by index. 0 if not found.
@@ -1545,7 +1671,10 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
Syntax
-
mono_metadata_type_equal
+
gboolean +mono_metadata_type_equal (MonoType *t1, MonoType *t2) + +

@@ -1560,8 +1689,14 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)

Syntax
-
mono_metadata_type_hash
+
guint +mono_metadata_type_hash (MonoType *t1) + +

+

Parameters
+
t1 a type
Description
+
Computes a hash value for t1 to be used in GHashTable. The returned hash is guaranteed to be the same across executions.
@@ -1575,8 +1710,17 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
Syntax
-
mono_metadata_declsec_from_index
+
guint32 +mono_metadata_declsec_from_index (MonoImage *meta, guint32 index) + +

+

Parameters
+
meta metadata context
index token representing the parent
Return value
+
the 0-based index into the DeclarativeSecurity table of the first + + attribute which belongs to the metadata object described by index. + Returns -1 if no such attribute is found.
@@ -1590,8 +1734,14 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
Syntax
-
mono_metadata_free_method_signature
+
void +mono_metadata_free_method_signature (MonoMethodSignature *sig) + +

+

Parameters
+
sig signature to destroy
Description
+

Free the memory allocated in the signature sig. This method needs to be robust and work also on partially-built signatures, so it does extra checks.

@@ -1608,7 +1758,10 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
Syntax
-
mono_metadata_parse_array
+
MonoArrayType* +mono_metadata_parse_array (MonoImage *m, const char *ptr, const char **rptr) + +

@@ -1623,8 +1776,17 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)

Syntax
-
mono_metadata_parse_custom_mod
+
int +mono_metadata_parse_custom_mod (MonoImage *m, MonoCustomMod *dest, const char *ptr, const char **rptr) + +

+

Parameters
+
m a metadata context.
dest storage where the info about the custom modifier is stored (may be NULL)
ptr a pointer to (possibly) the start of a custom modifier list
rptr pointer updated to match the end of the decoded stream
Return value
+
TRUE if a custom modifier was found, FALSE if not. +
+
Description
+

Checks if ptr points to a type custom modifier compressed representation.

@@ -1644,13 +1806,11 @@ mono_metadata_parse_field_type (MonoImage *m, short field_flags, const char *ptr

Parameters
-
m metadata context to extract information from
ptr pointer to the field signature
rptr pointer updated to match the end of the decoded stream
Return value
-
The MonoType that was extracted from ptr. +
m metadata context to extract information from
ptr pointer to the field signature
rptr pointer updated to match the end of the decoded stream
Return value
+
The MonoType that was extracted from ptr .
Description
-

- Parses the field signature, and returns the type information for it. -

+

Parses the field signature, and returns the type information for it.

@@ -1664,7 +1824,10 @@ mono_metadata_parse_field_type (MonoImage *m, short field_flags, const char *ptr
Syntax
-
mono_metadata_parse_marshal_spec
+
MonoMarshalSpec* +mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr) + +

@@ -1679,8 +1842,17 @@ mono_metadata_parse_field_type (MonoImage *m, short field_flags, const char *ptr

Syntax
-
mono_metadata_parse_method_signature
+
MonoMethodSignature* +mono_metadata_parse_method_signature (MonoImage *m, int def, const char *ptr, const char **rptr) + +

+

Parameters
+
m metadata context
def the MethodDef index or 0 for Ref signatures.
ptr pointer to the signature metadata representation
rptr pointer updated to match the end of the decoded stream
Return value
+
a MonoMethodSignature describing the signature. +
+
Description
+

Decode a method signature stored at ptr. This is a Mono runtime internal function.

LOCKING: Assumes the loader lock is held.

@@ -1694,8 +1866,17 @@ mono_metadata_parse_field_type (MonoImage *m, short field_flags, const char *ptr
Syntax
-
mono_metadata_parse_mh
+
MonoMethodHeader* +mono_metadata_parse_mh (MonoImage *m, const char *ptr) + +

+

Parameters
+
generic_context generics context
ptr pointer to the method header.
Return value
+
a transient MonoMethodHeader allocated from the heap. +
+
Description
+

Decode the method header at ptr, including pointer to the IL code, info about local variables and optional exception tables.

@@ -1715,28 +1896,11 @@ mono_metadata_parse_param (MonoImage *m, const char *ptr, const char **rptr)

Parameters
-
m metadata context to extract information from
ptr pointer to the param signature
rptr pointer updated to match the end of the decoded stream
Return value
-
The MonoType that was extracted from ptr. +
m metadata context to extract information from
ptr pointer to the param signature
rptr pointer updated to match the end of the decoded stream
Return value
+
The MonoType that was extracted from ptr .
Description
-

- Parses the param signature, and returns the type information for it. -

-
- - - - -
-
mono_metadata_parse_ret_type
-
-
-
-
- -
Syntax
-
mono_metadata_parse_ret_type
-

+

Parses the param signature, and returns the type information for it.

@@ -1750,8 +1914,17 @@ mono_metadata_parse_param (MonoImage *m, const char *ptr, const char **rptr)
Syntax
-
mono_metadata_parse_signature
+
MonoMethodSignature* +mono_metadata_parse_signature (MonoImage *image, guint32 token) + +

+

Parameters
+
image metadata context
token metadata token
Return value
+
a MonoMethodSignature describing the signature. +
+
Description
+

Decode a method signature stored in the StandAloneSig table

@@ -1765,8 +1938,16 @@ mono_metadata_parse_param (MonoImage *m, const char *ptr, const char **rptr)
Syntax
-
mono_metadata_parse_typedef_or_ref
+
guint32 +mono_metadata_parse_typedef_or_ref (MonoImage *m, const char *ptr, const char **rptr) + +

+

Parameters
+
m a metadata context.
ptr a pointer to an encoded TypedefOrRef in m
rptr pointer updated to match the end of the decoded stream
Return value
+
a token valid in the m metadata decoded from + + the compressed representation.
@@ -1787,25 +1968,11 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container

Parameters
-
m metadata context
mode king of type that may be found at ptr
opt_attrs optional attributes to store in the returned type
ptr pointer to the type representation
rptr pointer updated to match the end of the decoded stream
transient whenever to allocate the result from the heap or from a mempool
Return value
-
a MonoType structure representing the decoded type. +
m metadata context
mode kind of type that may be found at ptr
opt_attrs optional attributes to store in the returned type
ptr pointer to the type representation
rptr pointer updated to match the end of the decoded stream
transient whenever to allocate the result from the heap or from a mempool
Return value
+
a MonoType structure representing the decoded type.
Description
-

- Decode a compressed type description found at ptr in m. - mode can be one of MONO_PARSE_MOD_TYPE, MONO_PARSE_PARAM, MONO_PARSE_RET, - MONO_PARSE_FIELD, MONO_PARSE_LOCAL, MONO_PARSE_TYPE. - This function can be used to decode type descriptions in method signatures, - field signatures, locals signatures etc. -

- To parse a generic type, `generic_container' points to the current class'es - (the `generic_container' field in the MonoClass) or the current generic method's - (stored in image->property_hash) generic container. - When we encounter any MONO_TYPE_VAR or MONO_TYPE_MVAR's, they're looked up in - this MonoGenericContainer. -

- LOCKING: Acquires the loader lock. -

+

Decode a compressed type description found at ptr in m . mode can be one of MONO_PARSE_MOD_TYPE, MONO_PARSE_PARAM, MONO_PARSE_RET, MONO_PARSE_FIELD, MONO_PARSE_LOCAL, MONO_PARSE_TYPE. This function can be used to decode type descriptions in method signatures, field signatures, locals signatures etc.

To parse a generic type, generic_container points to the current class'es (the generic_container field in the MonoClass) or the current generic method's (stored in image->property_hash) generic container. When we encounter a MONO_TYPE_VAR or MONO_TYPE_MVAR, it's looked up in this MonoGenericContainer.

LOCKING: Acquires the loader lock.

@@ -1813,36 +1980,6 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container - -
-
mono_metadata_generic_class_equal
-
-
-
-
- -
Syntax
-
mono_metadata_generic_class_equal
-

-

-
-
- - -
-
mono_metadata_generic_class_hash
-
-
-
-
- -
Syntax
-
mono_metadata_generic_class_hash
-

-

-
-
-
mono_metadata_generic_class_is_valuetype
@@ -1852,7 +1989,10 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
Syntax
-
mono_metadata_generic_class_is_valuetype
+
gboolean +mono_metadata_generic_class_is_valuetype (MonoGenericClass *gclass) + +

@@ -1870,7 +2010,11 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
Syntax
-
mono_ldtoken
+
gpointer +mono_ldtoken (MonoImage *image, guint32 token, MonoClass **handle_class, + MonoGenericContext *context) + +

@@ -1891,12 +2035,11 @@ mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 idx)

Parameters
-
domain the domain where the string will be used.
image a metadata context
idx index into the user string table.
Return value
-
a loaded string from the image/idx combination. +
domain the domain where the string will be used.
image a metadata context
idx index into the user string table.
Return value
+
a loaded string from the image / idx combination.
Description
-

- Implementation for the ldstr opcode.

+
Implementation for the ldstr opcode.
@@ -1916,13 +2059,11 @@ mono_exception_from_token (MonoImage *image, guint32 token)

Parameters
-
image the Mono image where to look for the class
token The type token of the class
Return value
-
the initialized exception instance. +
image the Mono image where to look for the class
token The type token of the class
Return value
+
the initialized exception instance.
Description
-

- Creates an exception of the type given by token. -

+

Creates an exception of the type given by token.

@@ -1939,10 +2080,10 @@ mono_exception_from_token (MonoImage *image, guint32 token)
Syntax
-
mono_opcode_name
+
const char* +mono_opcode_name (int opcode) + +

- - - diff --git a/docs/deploy/mono-api-methods.html b/docs/deploy/mono-api-methods.html index 0262db3a2d..cee6326a8a 100644 --- a/docs/deploy/mono-api-methods.html +++ b/docs/deploy/mono-api-methods.html @@ -329,20 +329,11 @@ mono_method_desc_new (const char *name, gboolean include_namespace)

Parameters
-
name the method name.
include_namespace whether the name includes a namespace or not.
Return value
-
a parsed representation of the method description. +
name the method name.
include_namespace whether the name includes a namespace or not.
Return value
+
a parsed representation of the method description.
Description
-

- Creates a method description for name, which conforms to the following - specification: -

- [namespace.]classname:methodname[(args...)] -

- in all the loaded assemblies. -

- Both classname and methodname can contain '*' which matches anything. -

+

Creates a method description for name, which conforms to the following specification:

[namespace.]classname:methodname[(args...)]

in all the loaded assemblies.

Both classname and methodname can contain * which matches anything.

@@ -362,9 +353,8 @@ mono_method_desc_free (MonoMethodDesc *desc)

Parameters
-
desc method description to be released
Description
-

- Releases the MonoMethodDesc object desc.

+
desc method description to be released
Description
+
Releases the MonoMethodDesc object desc.
@@ -378,7 +368,10 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_desc_from_method
+
MonoMethodDesc* +mono_method_desc_from_method (MonoMethod *method) + +

@@ -393,7 +386,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_desc_full_match
+
gboolean +mono_method_desc_full_match (MonoMethodDesc *desc, MonoMethod *method) + +

@@ -408,8 +404,17 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_desc_match
+
gboolean +mono_method_desc_match (MonoMethodDesc *desc, MonoMethod *method) + +

+

Parameters
+
desc MonoMethoDescription
method MonoMethod to test
Return value
+
TRUE if the method matches the description, FALSE otherwise. +
+
Description
+

Determines whether the specified method matches the provided desc description.

namespace and class are supposed to match already if this function is used.

@@ -423,7 +428,10 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_desc_search_in_class
+
MonoMethod* +mono_method_desc_search_in_class (MonoMethodDesc *desc, MonoClass *klass) + +

@@ -438,7 +446,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_desc_search_in_image
+
MonoMethod* +mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image) + +

@@ -457,7 +468,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_full_name
+
char* +mono_method_full_name (MonoMethod *method, gboolean signature) + +

@@ -472,7 +486,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_class
+
MonoClass* +mono_method_get_class (MonoMethod *method) + +

@@ -487,7 +504,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_flags
+
guint32 +mono_method_get_flags (MonoMethod *method, guint32 *iflags) + +

@@ -502,7 +522,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_last_managed
+
MonoMethod* +mono_method_get_last_managed (void) + +

@@ -517,7 +540,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_marshal_info
+
void +mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs) + +

@@ -532,7 +558,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_name
+
const char* +mono_method_get_name (MonoMethod *method) + +

@@ -547,8 +576,15 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_object
+
MonoReflectionMethod* +mono_method_get_object (MonoDomain *domain, MonoMethod *method, MonoClass *refclass) + +

+

Parameters
+
domain an app domain
method a method
refclass the reflected type (can be NULL)
Return value
+
A System.Reflection.MonoMethod object representing the method method. +
@@ -562,7 +598,10 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_get_param_names
+
void +mono_method_get_param_names (MonoMethod *method, const char **names) + +

@@ -577,7 +616,10 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_param_token
+
guint32 +mono_method_get_param_token (MonoMethod *method, int index) + +

@@ -592,8 +634,13 @@ mono_method_desc_free (MonoMethodDesc *desc)

Syntax
-
mono_method_get_signature
+
MonoMethodSignature* +mono_method_get_signature (MonoMethod *method, MonoImage *image, guint32 token) + +

+

Description
+
token is the method_ref/def/spec token used in a call IL instruction. \deprecated use the _checked variant Notes: runtime code MUST not use this function
@@ -607,8 +654,13 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_get_index
+
guint32 +mono_method_get_index (MonoMethod *method) + +

+

Description
+
Find the method index in the metadata MethodDef table.
@@ -622,8 +674,13 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_get_signature_full
+
MonoMethodSignature* +mono_method_get_signature_full (MonoMethod *method, MonoImage *image, guint32 token, MonoGenericContext *context) + +

+

Description
+
token is the method ref/def/spec token used in a call IL instruction. \deprecated use the _checked variant Notes: runtime code MUST not use this function
@@ -637,7 +694,10 @@ mono_method_desc_free (MonoMethodDesc *desc)
Syntax
-
mono_method_get_token
+
guint32 +mono_method_get_token (MonoMethod *method) + +

@@ -658,53 +718,8 @@ mono_method_get_unmanaged_thunk (MonoMethod *method)

Parameters
-
method method to generate a thunk for.
Description
-

- Returns an unmanaged->managed thunk that can be used to call - a managed method directly from C. -

- The thunk's C signature closely matches the managed signature: -

- C#: public bool Equals (object obj); - C: typedef MonoBoolean (*Equals)(MonoObject*, - MonoObject*, MonoException**); -

- The 1st ("this") parameter must not be used with static methods: -

- C#: public static bool ReferenceEquals (object a, object b); - C: typedef MonoBoolean (*ReferenceEquals)(MonoObject*, MonoObject*, - MonoException**); -

- The last argument must be a non-null pointer of a MonoException* pointer. - It has "out" semantics. After invoking the thunk, *ex will be NULL if no - exception has been thrown in managed code. Otherwise it will point - to the MonoException* caught by the thunk. In this case, the result of - the thunk is undefined: -

- MonoMethod *method = ... // MonoMethod* of System.Object.Equals - MonoException *ex = NULL; - Equals func = mono_method_get_unmanaged_thunk (method); - MonoBoolean res = func (thisObj, objToCompare, &ex); - if (ex) { - // handle exception - } -

- The calling convention of the thunk matches the platform's default - convention. This means that under Windows, C declarations must - contain the __stdcall attribute: -

- C: typedef MonoBoolean (__stdcall *Equals)(MonoObject*, - MonoObject*, MonoException**); -

- LIMITATIONS -

- Value type arguments and return values are treated as they were objects: -

- C#: public static Rectangle Intersect (Rectangle a, Rectangle b); - C: typedef MonoObject* (*Intersect)(MonoObject*, MonoObject*, MonoException**); -

- Arguments must be properly boxed upon trunk's invocation, while return - values must be unboxed.

+
method method to generate a thunk for.
Description
+

Returns an unmanaged->managed thunk that can be used to call a managed method directly from C.

The thunk's C signature closely matches the managed signature:

C#: public bool Equals (object obj);

C: typedef MonoBoolean (*Equals)(MonoObject*, MonoObject*, MonoException**);

The 1st (this) parameter must not be used with static methods:

C#: public static bool ReferenceEquals (object a, object b);

C: typedef MonoBoolean (*ReferenceEquals)(MonoObject*, MonoObject*, MonoException**);

The last argument must be a non-null MonoException* pointer. It has "out" semantics. After invoking the thunk, *ex will be NULL if no exception has been thrown in managed code. Otherwise it will point to the MonoException* caught by the thunk. In this case, the result of the thunk is undefined: 

 	 MonoMethod *method = ... // MonoMethod* of System.Object.Equals 	
 	 MonoException *ex = NULL; 	
 	 Equals func = mono_method_get_unmanaged_thunk (method); 	
 	 MonoBoolean res = func (thisObj, objToCompare, &ex); 	
 	 if (ex) { 	
 	    // handle exception 	
 	 }

The calling convention of the thunk matches the platform's default convention. This means that under Windows, C declarations must contain the __stdcall attribute:

C: typedef MonoBoolean (__stdcall *Equals)(MonoObject*, MonoObject*, MonoException**);

LIMITATIONS

Value type arguments and return values are treated as they were objects:

C#: public static Rectangle Intersect (Rectangle a, Rectangle b); C: typedef MonoObject* (*Intersect)(MonoObject*, MonoObject*, MonoException**);

Arguments must be properly boxed upon trunk's invocation, while return values must be unboxed.

@@ -718,7 +733,10 @@ mono_method_get_unmanaged_thunk (MonoMethod *method)
Syntax
-
mono_method_has_marshal_info
+
gboolean +mono_method_has_marshal_info (MonoMethod *method) + +

@@ -733,8 +751,13 @@ mono_method_get_unmanaged_thunk (MonoMethod *method)

Syntax
-
mono_method_verify
+
GSList* +mono_method_verify (MonoMethod *method, int level) + +

+

Description
+
Verify types for opcodes.
@@ -758,34 +781,8 @@ mono_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **

Parameters
-
method method to invoke
obJ object instance
params arguments to the method
exc exception information.
Description
-

- Invokes the method represented by method on the object obj. -

- obj is the 'this' pointer, it should be NULL for static - methods, a MonoObject* for object instances and a pointer to - the value type for value types. -

- The params array contains the arguments to the method with the - same convention: MonoObject* pointers for object instances and - pointers to the value type otherwise. -

- From unmanaged code you'll usually use the - mono_runtime_invoke() variant. -

- Note that this function doesn't handle virtual methods for - you, it will exec the exact method you pass: we still need to - expose a function to lookup the derived class implementation - of a virtual method (there are examples of this in the code, - though). -

- You can pass NULL as the exc argument if you don't want to - catch exceptions, otherwise, *exc will be set to the exception - thrown, if any. if an exception is thrown, you can't use the - MonoObject* result from the function. -

- If the method returns a value type, it is boxed in an object - reference.

+
method method to invoke
obj object instance
params arguments to the method
exc exception information.
Description
+
Invokes the method represented by method on the object obj. obj is the this pointer, it should be NULL for static methods, a MonoObject* for object instances and a pointer to the value type for value types.

The params array contains the arguments to the method with the same convention: MonoObject* pointers for object instances and pointers to the value type otherwise.

From unmanaged code you'll usually use the mono_runtime_invoke variant.

Note that this function doesn't handle virtual methods for you, it will exec the exact method you pass: we still need to expose a function to lookup the derived class implementation of a virtual method (there are examples of this in the code, though).

You can pass NULL as the exc argument if you don't want to catch exceptions, otherwise, *exc will be set to the exception thrown, if any. if an exception is thrown, you can't use the MonoObject* result from the function.

If the method returns a value type, it is boxed in an object reference.

@@ -828,37 +825,8 @@ mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,

Parameters
-
method method to invoke
obJ object instance
params arguments to the method
exc exception information.
Description
-

- Invokes the method represented by method on the object obj. -

- obj is the 'this' pointer, it should be NULL for static - methods, a MonoObject* for object instances and a pointer to - the value type for value types. -

- The params array contains the arguments to the method with the - same convention: MonoObject* pointers for object instances and - pointers to the value type otherwise. The _invoke_array - variant takes a C# object[] as the params argument (MonoArray - *params): in this case the value types are boxed inside the - respective reference representation. -

- From unmanaged code you'll usually use the - mono_runtime_invoke_checked() variant. -

- Note that this function doesn't handle virtual methods for - you, it will exec the exact method you pass: we still need to - expose a function to lookup the derived class implementation - of a virtual method (there are examples of this in the code, - though). -

- You can pass NULL as the exc argument if you don't want to - catch exceptions, otherwise, *exc will be set to the exception - thrown, if any. if an exception is thrown, you can't use the - MonoObject* result from the function. -

- If the method returns a value type, it is boxed in an object - reference.

+
method method to invoke
obj object instance
params arguments to the method
exc exception information.
Description
+
Invokes the method represented by method on the object obj.

obj is the this pointer, it should be NULL for static methods, a MonoObject* for object instances and a pointer to the value type for value types.

The params array contains the arguments to the method with the same convention: MonoObject* pointers for object instances and pointers to the value type otherwise. The _invoke_array variant takes a C# object[] as the params argument (MonoArray*): in this case the value types are boxed inside the respective reference representation.

From unmanaged code you'll usually use the mono_runtime_invoke_checked() variant.

Note that this function doesn't handle virtual methods for you, it will exec the exact method you pass: we still need to expose a function to lookup the derived class implementation of a virtual method (there are examples of this in the code, though).

You can pass NULL as the exc argument if you don't want to catch exceptions, otherwise, *exc will be set to the exception thrown, if any. if an exception is thrown, you can't use the MonoObject* result from the function.

If the method returns a value type, it is boxed in an object reference.

@@ -878,14 +846,8 @@ mono_runtime_delegate_invoke (MonoObject *delegate, void **params, MonoObject **

Parameters
-
delegate pointer to a delegate object.
params parameters for the delegate.
exc Pointer to the exception result.
Description
-

- Invokes the delegate method delegate with the parameters provided. -

- You can pass NULL as the exc argument if you don't want to - catch exceptions, otherwise, *exc will be set to the exception - thrown, if any. if an exception is thrown, you can't use the - MonoObject* result from the function.

+
delegate pointer to a delegate object.
params parameters for the delegate.
exc Pointer to the exception result.
Description
+

Invokes the delegate method delegate with the parameters provided.

You can pass NULL as the exc argument if you don't want to catch exceptions, otherwise, *exc will be set to the exception thrown, if any. if an exception is thrown, you can't use the MonoObject* result from the function.

@@ -900,8 +862,15 @@ mono_runtime_delegate_invoke (MonoObject *delegate, void **params, MonoObject **
Syntax
-
mono_method_body_get_object
+
MonoReflectionMethodBody* +mono_method_body_get_object (MonoDomain *domain, MonoMethod *method) + +

+

Parameters
+
domain an app domain
method a method
Return value
+
A System.Reflection.MethodBody object representing the method method. +
@@ -924,9 +893,9 @@ mono_method_signature (MonoMethod *m)

-

Description
-

- Return the signature of the method M. On failure, returns NULL.

+
Return value
+
the signature of the method m. On failure, returns NULL. +
@@ -946,12 +915,10 @@ mono_signature_explicit_this (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
#TRUE if this the method signature sig has an explicit +
sig the method signature inspected
Return value
+
TRUE if this the method signature sig has an explicit - instance argument. #FALSE otherwise.
-
Description
-

+ instance argument. FALSE otherwise.
@@ -971,11 +938,9 @@ mono_signature_get_call_conv (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
the call convention of the method signature sig. +
sig the method signature inspected
Return value
+
the call convention of the method signature sig.
-
Description
-

@@ -989,7 +954,10 @@ mono_signature_get_call_conv (MonoMethodSignature *sig)
Syntax
-
mono_signature_get_desc
+
char* +mono_signature_get_desc (MonoMethodSignature *sig, gboolean include_namespace) + +

@@ -1010,11 +978,9 @@ mono_signature_get_param_count (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
the number of parameters in the method signature sig. +
sig the method signature inspected
Return value
+
the number of parameters in the method signature sig.
-
Description
-

@@ -1034,17 +1000,12 @@ mono_signature_get_params (MonoMethodSignature *sig, gpointer *iter)

Parameters
-
sig the method signature inspected
iter pointer to an iterator
Return value
-
the next parameter type of the method signature sig, +
sig the method signature inspected
iter pointer to an iterator
Return value
+
the next parameter type of the method signature sig, - #NULL when finished.
+ NULL when finished.
Description
-

- Iterates over the parameters for the method signature sig. - A void* pointer must be initualized to #NULL to start the iteration - and it's address is passed to this function repeteadly until it returns - #NULL. -

+
Iterates over the parameters for the method signature sig. A void* pointer must be initialized to NULL to start the iteration and its address is passed to this function repeteadly until it returns NULL.
@@ -1064,11 +1025,9 @@ mono_signature_get_return_type (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
the return type of the method signature sig +
sig the method signature inspected
Return value
+
the return type of the method signature sig
-
Description
-

@@ -1082,7 +1041,10 @@ mono_signature_get_return_type (MonoMethodSignature *sig)
Syntax
-
mono_signature_hash
+
guint +mono_signature_hash (MonoMethodSignature *sig) + +

@@ -1103,12 +1065,10 @@ mono_signature_is_instance (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
#TRUE if this the method signature sig has an implicit +
sig the method signature inspected
Return value
+
TRUE if this the method signature sig has an implicit - first instance argument. #FALSE otherwise.
-
Description
-

+ first instance argument. FALSE otherwise.
@@ -1128,12 +1088,10 @@ mono_signature_param_is_out (MonoMethodSignature *sig, int param_num)

Parameters
-
sig the method signature inspected
param_num the 0-based index of the inspected parameter
Return value
-
#TRUE if the parameter is an out parameter, #FALSE +
sig the method signature inspected
param_num the 0-based index of the inspected parameter
Return value
+
TRUE if the parameter is an out parameter, FALSE otherwise.
-
Description
-

@@ -1153,12 +1111,10 @@ mono_signature_vararg_start (MonoMethodSignature *sig)

Parameters
-
sig the method signature inspected
Return value
-
the number of the first vararg parameter in the +
sig the method signature inspected
Return value
+
the number of the first vararg parameter in the - method signature sig. -1 if this is not a vararg signature.
-
Description
-

+ method signature \param sig. -1 if this is not a vararg signature.
@@ -1172,7 +1128,10 @@ mono_signature_vararg_start (MonoMethodSignature *sig)
Syntax
-
mono_param_get_objects
+
MonoArray* +mono_param_get_objects (MonoDomain *domain, MonoMethod *method) + +

@@ -1187,7 +1146,11 @@ mono_signature_vararg_start (MonoMethodSignature *sig)

Syntax
-
mono_get_method_full
+
MonoMethod* +mono_get_method_full (MonoImage *image, guint32 token, MonoClass *klass, + MonoGenericContext *context) + +

@@ -1202,7 +1165,10 @@ mono_signature_vararg_start (MonoMethodSignature *sig)

Syntax
-
mono_get_method
+
MonoMethod* +mono_get_method (MonoImage *image, guint32 token, MonoClass *klass) + +

@@ -1221,7 +1187,10 @@ mono_signature_vararg_start (MonoMethodSignature *sig)

Syntax
-
mono_method_get_header
+
MonoMethodHeader* +mono_method_get_header (MonoMethod *method) + +

@@ -1236,8 +1205,18 @@ mono_signature_vararg_start (MonoMethodSignature *sig)

Syntax
-
mono_method_header_get_clauses
+
int +mono_method_header_get_clauses (MonoMethodHeader *header, MonoMethod *method, gpointer *iter, MonoExceptionClause *clause) + +

+

Parameters
+
header a MonoMethodHeader pointer
method MonoMethod the header belongs to
iter pointer to a iterator
clause pointer to a MonoExceptionClause structure which will be filled with the info
Return value
+
TRUE if clause was filled with info, FALSE if there are no more exception + + clauses.
+
Description
+

Get the info about the exception clauses in the method. Set *iter to NULL to initiate the iteration, then call the method repeatedly until it returns FALSE. At each iteration, the structure pointed to by clause if filled with the exception clause information.

@@ -1251,8 +1230,17 @@ mono_signature_vararg_start (MonoMethodSignature *sig)
Syntax
-
mono_method_header_get_code
+
const unsigned char* +mono_method_header_get_code (MonoMethodHeader *header, guint32* code_size, guint32* max_stack) + +

+

Parameters
+
header a MonoMethodHeader pointer
code_size memory location for returning the code size
max_stack memory location for returning the max stack
Return value
+
pointer to the IL code represented by the method header. +
+
Description
+

Method header accessor to retreive info about the IL code properties: a pointer to the IL code itself, the size of the code and the max number of stack slots used by the code.

@@ -1266,10 +1254,16 @@ mono_signature_vararg_start (MonoMethodSignature *sig)
Syntax
-
mono_method_header_get_locals
+
MonoType* +mono_method_header_get_locals (MonoMethodHeader *header, guint32* num_locals, gboolean *init_locals) + +

+

Parameters
+
header a MonoMethodHeader pointer
num_locals memory location for returning the number of local variables
init_locals memory location for returning the init_locals flag
Return value
+
pointer to an array of types of the local variables +
+
Description
+

Method header accessor to retreive info about the local variables: an array of local types, the number of locals and whether the locals are supposed to be initialized to 0 on method entry

- - - diff --git a/docs/deploy/mono-api-object.html b/docs/deploy/mono-api-object.html index 1840a6c6b3..314b56e82a 100644 --- a/docs/deploy/mono-api-object.html +++ b/docs/deploy/mono-api-object.html @@ -228,123 +228,6 @@ typedef struct { double vector [MONO_ZERO_LEN_ARRAY]; } MonoArray; -MonoObject* mono_object_new (MonoDomain *domain, - MonoClass *klass); -MonoObject* mono_object_new_alloc_specific (MonoVTable *vtable); -MonoObject* mono_object_new_fast (MonoVTable *vtable); -MonoObject* mono_object_new_from_token (MonoDomain *domain, - MonoImage *image, - guint32 token); -MonoObject* mono_object_new_specific (MonoVTable *vtable); -MonoObject* mono_object_clone (MonoObject *obj); -MonoClass* mono_object_get_class (MonoObject *obj); -MonoDomain* mono_object_get_domain (MonoObject *obj); -MonoMethod* mono_object_handle_get_virtual_method (MonoObjectHandle obj, - MonoMethod *method, - MonoError *error); - mono_object_isinst_mbyref -MonoObject* mono_object_isinst (MonoObject *obj_raw, - MonoClass *klass); -gpointer mono_object_unbox (MonoObject *obj); -MonoObject* mono_object_castclass_mbyref (MonoObject *obj_raw, - MonoClass *klass); -guint mono_object_get_size (MonoObject* o); - mono_object_hash -MonoString* mono_object_to_string (MonoObject *obj, - MonoObject **exc); -MonoObject* mono_value_box (MonoDomain *domain, - MonoClass *klass, - gpointer value); -void mono_value_copy (gpointer dest, - gpointer src, - MonoClass *klass); -void mono_value_copy_array (MonoArray *dest, - int dest_idx, - gpointer src, - int count); -MonoArray* mono_array_new (MonoDomain *domain, - MonoClass *eclass, - uintptr_t n); -MonoArray* mono_array_new_full (MonoDomain *domain, - MonoClass *array_class, - uintptr_t *lengths, - intptr_t *lower_bounds); -MonoArray* mono_array_new_specific (MonoVTable *vtable, - uintptr_t n); -MonoClass* mono_array_class_get (MonoClass *eclass, - guint32 rank); -MonoArray* mono_array_clone (MonoArray *array); - mono_array_get -uintptr_t mono_array_length (MonoArray *array); - mono_array_set - mono_array_setref - mono_array_addr -char* mono_array_addr_with_size (MonoArray *array, - int size, - uintptr_t idx); -gint32 mono_array_element_size (MonoClass *ac); - mono_field_from_token - mono_field_get_flags -const char* mono_field_get_name (MonoClassField *field); -MonoClass* mono_field_get_parent (MonoClassField *field); -MonoType* mono_field_get_type (MonoClassField *field); -void mono_field_get_value (MonoObject *obj, - MonoClassField *field, - void *value); -MonoObject* mono_field_get_value_object (MonoDomain *domain, - MonoClassField *field, - MonoObject *obj); -void mono_field_set_value (MonoObject *obj, - MonoClassField *field, - void *value); -void mono_field_static_get_value (MonoVTable *vt, - MonoClassField *field, - void *value); -void mono_field_static_set_value (MonoVTable *vt, - MonoClassField *field, - void *value); - mono_field_get_object -MonoReflectionProperty* mono_property_get_object_checked (MonoDomain *domain, - MonoClass *klass, - MonoProperty *property, - MonoError *error); -guint32 mono_property_get_flags (MonoProperty *prop); -MonoMethod* mono_property_get_get_method (MonoProperty *prop); - mono_property_get_name -MonoClass* mono_property_get_parent (MonoProperty *prop); -MonoMethod* mono_property_get_set_method (MonoProperty *prop); -MonoObject* mono_property_get_value (MonoProperty *prop, - void *obj, - void **params, - MonoObject **exc); -void mono_property_set_value (MonoProperty *prop, - void *obj, - void **params, - MonoObject **exc); - mono_event_get_object -MonoMethod* mono_event_get_add_method (MonoEvent *event); -guint32 mono_event_get_flags (MonoEvent *event); -const char* mono_event_get_name (MonoEvent *event); -MonoClass* mono_event_get_parent (MonoEvent *event); -MonoMethod* mono_event_get_raise_method (MonoEvent *event); -MonoMethod* mono_event_get_remove_method (MonoEvent *event); -gpointer mono_load_remote_field (MonoObject *this_obj, - MonoClass *klass, - MonoClassField *field, - gpointer *res); -MonoObject* mono_load_remote_field_new (MonoObject *this_obj, - MonoClass *klass, - MonoClassField *field); -void mono_store_remote_field (MonoObject *this_obj, - MonoClass *klass, - MonoClassField *field, - gpointer val); -void mono_store_remote_field_new (MonoObject *this_obj, - MonoClass *klass, - MonoClassField *field, - MonoObject *arg); -MonoMethod* mono_get_delegate_begin_invoke (MonoClass *klass); -MonoMethod* mono_get_delegate_end_invoke (MonoClass *klass); @@ -381,16 +264,14 @@ mono_object_new (MonoDomain *domain, MonoClass *klass)

Parameters
-
klass the class of the object that we want to create
Return value
-
a newly created object whose definition is +
klass the class of the object that we want to create
Return value
+
a newly created object whose definition is looked up using klass. This will not invoke any constructors, so the consumer of this routine has to invoke any constructors on its own to initialize the object.

It returns NULL on failure.

-
Description
-

@@ -426,19 +307,11 @@ mono_object_new_alloc_specific (MonoVTable *vtable)

Parameters
-
vtable virtual table for the object.
Return value
-
the allocated object. +
vtable virtual table for the object.
Return value
+
the allocated object.
Description
-

- This function allocates a new MonoObject with the type derived - from the vtable information. If the class of this object has a - finalizer, then the object will be tracked for finalization. -

- This method might raise an exception on errors. Use the - mono_object_new_fast_checked method if you want to manually raise - the exception. -

+
This function allocates a new MonoObject with the type derived from the vtable information. If the class of this object has a finalizer, then the object will be tracked for finalization.

This method might raise an exception on errors. Use the mono_object_new_fast_checked method if you want to manually raise the exception.

@@ -458,20 +331,11 @@ mono_object_new_fast (MonoVTable *vtable)

Parameters
-
vtable virtual table for the object.
Return value
-
the allocated object. +
vtable virtual table for the object.
Return value
+
the allocated object.
Description
-

- This function allocates a new MonoObject with the type derived - from the vtable information. The returned object is not tracked - for finalization. If your object implements a finalizer, you should - use mono_object_new_alloc_specific instead. -

- This method might raise an exception on errors. Use the - mono_object_new_fast_checked method if you want to manually raise - the exception. -

+

This function allocates a new MonoObject with the type derived from the vtable information. The returned object is not tracked for finalization. If your object implements a finalizer, you should use mono_object_new_alloc_specific instead.

This method might raise an exception on errors. Use the mono_object_new_fast_checked method if you want to manually raise the exception.

@@ -491,12 +355,10 @@ mono_object_new_from_token (MonoDomain *domain, MonoImage *image, guint32 token

Parameters
-
image Context where the type_token is hosted
token a token of the type that we want to create
Return value
-
A newly created object whose definition is +
image Context where the type_token is hosted
token a token of the type that we want to create
Return value
+
A newly created object whose definition is looked up using token in the image image
-
Description
-

@@ -516,12 +378,10 @@ mono_object_new_specific (MonoVTable *vtable)

Parameters
-
vtable the vtable of the object that we want to create
Return value
-
A newly created object with class and domain specified +
vtable the vtable of the object that we want to create
Return value
+
A newly created object with class and domain specified by vtable
-
Description
-

@@ -541,11 +401,9 @@ mono_object_clone (MonoObject *obj)

Parameters
-
obj the object to clone
Return value
-
A newly created object who is a shallow copy of obj +
obj the object to clone
Return value
+
A newly created object who is a shallow copy of obj
-
Description
-

@@ -565,13 +423,11 @@ mono_object_get_class (MonoObject *obj)

Parameters
-
obj object to query
Return value
-
the MonoClass of the object. +
obj object to query
Return value
+
the MonoClass of the object.
Description
-

- Use this function to obtain the MonoClass* for a given MonoObject. -

+
Use this function to obtain the MonoClass* for a given MonoObject.
@@ -591,11 +447,9 @@ mono_object_get_domain (MonoObject *obj)

Parameters
-
obj object to query
Return value
-
the MonoDomain where the object is hosted +
obj object to query
Return value
+
the MonoDomain where the object is hosted
-
Description
-

@@ -610,15 +464,13 @@ mono_object_get_domain (MonoObject *obj)
Syntax
MonoMethod* -mono_object_handle_get_virtual_method (MonoObjectHandle obj, MonoMethod *method, MonoError *error) +mono_object_get_virtual_method (MonoObject *obj_raw, MonoMethod *method)

Parameters
-
obj object to operate on.
method method
Description
-

- Retrieves the MonoMethod that would be called on obj if obj is passed as - the instance of a callvirt of method.

+
obj object to operate on.
method method
Description
+
Retrieves the MonoMethod that would be called on obj if obj is passed as the instance of a callvirt of method.
@@ -632,7 +484,10 @@ mono_object_handle_get_virtual_method (MonoObjectHandle obj, MonoMethod *method,
Syntax
-
mono_object_isinst_mbyref
+
MonoObject* +mono_object_isinst_mbyref (MonoObject *obj_raw, MonoClass *klass) + +

@@ -653,11 +508,9 @@ mono_object_isinst (MonoObject *obj_raw, MonoClass *klass)

Parameters
-
obj an object
klass a pointer to a class
Return value
-
obj if obj is derived from klass or NULL otherwise. +
obj an object
klass a pointer to a class
Return value
+
obj if obj is derived from klass or NULL otherwise.
-
Description
-

@@ -677,14 +530,12 @@ mono_object_unbox (MonoObject *obj)

Parameters
-
obj object to unbox
Return value
-
a pointer to the start of the valuetype boxed in this +
obj object to unbox
Return value
+
a pointer to the start of the valuetype boxed in this object.

This method will assert if the object passed is not a valuetype.

-
Description
-

@@ -704,11 +555,9 @@ mono_object_castclass_mbyref (MonoObject *obj_raw, MonoClass *klass)

Parameters
-
obj an object
klass a pointer to a class
Return value
-
obj if obj is derived from klass, returns NULL otherwise. +
obj an object
klass a pointer to a class
Return value
+
obj if obj is derived from klass, returns NULL otherwise.
-
Description
-

@@ -728,11 +577,9 @@ mono_object_get_size (MonoObject* o)

Parameters
-
o object to query
Return value
-
the size, in bytes, of o +
o object to query
Return value
+
the size, in bytes, of o
-
Description
-

@@ -767,11 +614,9 @@ mono_object_to_string (MonoObject *obj, MonoObject **exc)

Parameters
-
obj The object
exc Any exception thrown by ToString (). May be NULL.
Return value
-
the result of calling ToString () on an object. +
obj The object
exc Any exception thrown by ToString. May be NULL.
Return value
+
the result of calling ToString on an object.
-
Description
-

@@ -795,11 +640,9 @@ mono_value_box (MonoDomain *domain, MonoClass *klass, gpointer value)

Parameters
-
class the class of the value
value a pointer to the unboxed data
Return value
-
A newly created object which contains value. +
class the class of the value
value a pointer to the unboxed data
Return value
+
A newly created object which contains value.
-
Description
-

@@ -819,10 +662,8 @@ mono_value_copy (gpointer dest, gpointer src, MonoClass *klass)

Parameters
-
dest destination pointer
src source pointer
klass a valuetype class
Description
-

- Copy a valuetype from src to dest. This function must be used - when klass contains references fields.

+
dest destination pointer
src source pointer
klass a valuetype class
Description
+
Copy a valuetype from src to dest. This function must be used when klass contains reference fields.
@@ -842,11 +683,8 @@ mono_value_copy_array (MonoArray *dest, int dest_idx, gpointer src, int count)

Parameters
-
dest destination array
dest_idx index in the dest array
src source pointer
count number of items
Description
-

- Copy count valuetype items from src to the array dest at index dest_idx. - This function must be used when klass contains references fields. - Overlap is handled.

+
dest destination array
dest_idx index in the dest array
src source pointer
count number of items
Description
+
Copy count valuetype items from src to the array dest at index dest_idx. This function must be used when klass contains references fields. Overlap is handled.
@@ -892,9 +730,8 @@ mono_array_new (MonoDomain *domain, MonoClass *eclass, uintptr_t n)

Parameters
-
domain domain where the object is created
eclass element class
n number of array elements
Description
-

- This routine creates a new szarray with n elements of type eclass.

+
domain domain where the object is created
eclass element class
n number of array elements
Description
+
This routine creates a new szarray with n elements of type eclass.
@@ -914,10 +751,8 @@ mono_array_new_full (MonoDomain *domain, MonoClass *array_class, uintptr_t *leng

Parameters
-
domain domain where the object is created
array_class array class
lengths lengths for each dimension in the array
lower_bounds lower bounds for each dimension in the array (may be NULL)
Description
-

- This routine creates a new array objects with the given dimensions, - lower bounds and type.

+
domain domain where the object is created
array_class array class
lengths lengths for each dimension in the array
lower_bounds lower bounds for each dimension in the array (may be NULL)
Description
+
This routine creates a new array object with the given dimensions, lower bounds and type.
@@ -937,10 +772,8 @@ mono_array_new_specific (MonoVTable *vtable, uintptr_t n)

Parameters
-
vtable a vtable in the appropriate domain for an initialized class
n number of array elements
Description
-

- This routine is a fast alternative to mono_array_new() for code which - can be sure about the domain it operates in.

+
vtable a vtable in the appropriate domain for an initialized class
n number of array elements
Description
+
This routine is a fast alternative to mono_array_new for code which can be sure about the domain it operates in.
@@ -960,12 +793,10 @@ mono_array_class_get (MonoClass *eclass, guint32 rank)

Parameters
-
element_class element class
rank the dimension of the array class
Return value
-
A class object describing the array with element type element_type and +
element_class element class
rank the dimension of the array class
Return value
+
A class object describing the array with element type element_type and - dimension rank.
-
Description
-

+ dimension rank.
@@ -985,11 +816,9 @@ mono_array_clone (MonoArray *array)

Parameters
-
array the array to clone
Return value
-
A newly created array who is a shallow copy of array +
array the array to clone
Return value
+
A newly created array who is a shallow copy of array
-
Description
-

@@ -1028,21 +857,11 @@ mono_array_clone (MonoArray *array)

Parameters
-
array array on which to operate on
element_type C element type (example: MonoString *, int, MonoObject *)
index index into the array
Return value
-
The element at the index position in the array. +
array array on which to operate on
element_type C element type (example: MonoString*, int, MonoObject*)
index index into the array
Return value
+
The element at the index position in the array.
Description
-

- Use this macro to retrieve the index element of an array and - extract the value assuming that the elements of the array match - the provided type value. -

- This method can be used with both arrays holding value types and - reference types. For reference types, the type parameter should - be a MonoObject* or any subclass of it, like MonoString*. -

- This macro does not attempt to perform type checking or bounds checking. -

+

Use this macro to retrieve the index element of an array and extract the value assuming that the elements of the array match the provided type value.

This method can be used with both arrays holding value types and reference types. For reference types, the type parameter should be a MonoObject* or any subclass of it, like MonoString*.

This macro does not attempt to perform type checking or bounds checking.

@@ -1062,9 +881,9 @@ mono_array_length (MonoArray *array)

Parameters
-
array a MonoArray*
Description
-

- Returns the total number of elements in the array. This works for +
array a MonoArray*

Return value
+
the total number of elements in the array. This works for + both vectors and multidimensional arrays.
@@ -1084,14 +903,8 @@ mono_array_length (MonoArray *array)

Parameters
-
array array to alter
element_type A C type name, this macro will use the sizeof(type) to determine the element size
index index into the array
value value to set
Description
-

- Value Type version: This sets the index's element of the array - with elements of size sizeof(type) to the provided value. -

- This macro does not attempt to perform type checking or bounds checking. -

- Use this to set value types in a MonoArray.

+
array array to alter
element_type A C type name, this macro will use the sizeof(type) to determine the element size
index index into the array
value value to set
version This sets the index's element of the array
Description
+
with elements of size sizeof(type) to the provided value.

This macro does not attempt to perform type checking or bounds checking.

Use this to set value types in a MonoArray.

@@ -1110,14 +923,8 @@ mono_array_length (MonoArray *array)

Parameters
-
array array to alter
index index into the array
value value to set
Description
-

- Reference Type version: This sets the index's element of the - array with elements of size sizeof(type) to the provided value. -

- This macro does not attempt to perform type checking or bounds checking. -

- Use this to reference types in a MonoArray.

+
array array to alter
index index into the array
value value to set
Description
+
Reference Type version. This sets the index's element of the array with elements of size sizeof(type) to the provided value.

This macro does not attempt to perform type checking or bounds checking.

Use this to reference types in a MonoArray.

@@ -1152,14 +959,11 @@ mono_array_addr_with_size (MonoArray *array, int size, uintptr_t idx)

Parameters
-
array a MonoArray*
size size of the array elements
idx index into the array
Description
-

- Use this function to obtain the address for the idx item on the - array containing elements of size size. -

- This method performs no bounds checking or type checking. -

- Returns the address of the idx element in the array.

+
array a MonoArray*
size size of the array elements
idx index into the array
Return value
+
the address of the idx element in the array. +
+
Description
+
Use this function to obtain the address for the idx item on the array containing elements of size size.

This method performs no bounds checking or type checking.

@@ -1179,11 +983,11 @@ mono_array_element_size (MonoClass *ac)

Parameters
-
ac pointer to a MonoArrayClass
Return value
-
The size of single array element. +
ac pointer to a MonoArrayClass
Return value
+
The size of single array element.
Description
-

+

@@ -1194,16 +998,20 @@ mono_array_element_size (MonoClass *ac)
-
mono_field_from_token
+
mono_field_from_token

Deprecated: use the _checked variant
Syntax
-
mono_field_from_token
+
MonoClassField* +mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass, MonoGenericContext *context) + +

-

+
Parameters
+
Notes runtime code MUST not use this function
@@ -1237,11 +1045,11 @@ mono_field_get_name (MonoClassField *field)

Parameters
-
field the MonoClassField to act on
Return value
-
The name of the field. +
field the MonoClassField to act on
Return value
+
The name of the field.
Description
-

+

@@ -1261,11 +1069,11 @@ mono_field_get_parent (MonoClassField *field)

Parameters
-
field the MonoClassField to act on
Return value
-
MonoClass where the field was defined. +
field the MonoClassField to act on
Return value
+
MonoClass where the field was defined.
Description
-

+

@@ -1285,11 +1093,9 @@ mono_field_get_type (MonoClassField *field)

Parameters
-
field the MonoClassField to act on
Return value
-
MonoType of the field. +
field the MonoClassField to act on
Return value
+
MonoType of the field.
-
Description
-

@@ -1309,18 +1115,8 @@ mono_field_get_value (MonoObject *obj, MonoClassField *field, void *value)

Parameters
-
obj Object instance
field MonoClassField describing the field to fetch information from
value pointer to the location where the value will be stored
Description
-

- Use this routine to get the value of the field field in the object - passed. -

- The pointer provided by value must be of the field type, for reference - types this is a MonoObject*, for value types its the actual pointer to - the value type. -

- For example: - int i; - mono_field_get_value (obj, int_field, &i);

+
obj Object instance
field MonoClassField describing the field to fetch information from
value pointer to the location where the value will be stored
Description
+
Use this routine to get the value of the field field in the object passed.

The pointer provided by value must be of the field type, for reference types this is a MonoObject*, for value types its the actual pointer to the value type.

For example: 

 	 int i; 	
 	 mono_field_get_value (obj, int_field, &i);
@@ -1340,13 +1136,10 @@ mono_field_get_value_object (MonoDomain *domain, MonoClassField *field, MonoObje

Parameters
-
domain domain where the object will be created (if boxing)
field MonoClassField describing the field to fetch information from
obj The object instance for the field.
Return value
-
a new MonoObject with the value from the given field. If the +
domain domain where the object will be created (if boxing)
field MonoClassField describing the field to fetch information from
obj The object instance for the field.
Return value
+
a new MonoObject with the value from the given field. If the - field represents a value type, the value is boxed. -

-
Description
-

+ field represents a value type, the value is boxed.
@@ -1366,13 +1159,8 @@ mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value)

Parameters
-
obj Instance object
field MonoClassField describing the field to set
value The value to be set
Description
-

- Sets the value of the field described by field in the object instance obj - to the value passed in value. This method should only be used for instance - fields. For static fields, use mono_field_static_set_value. -

- The value must be on the native format of the field type.

+
obj Instance object
field MonoClassField describing the field to set
value The value to be set
Description
+

Sets the value of the field described by field in the object instance obj to the value passed in value. This method should only be used for instance fields. For static fields, use mono_field_static_set_value.

The value must be in the native format of the field type.

@@ -1392,17 +1180,8 @@ mono_field_static_get_value (MonoVTable *vt, MonoClassField *field, void *value)

Parameters
-
vt vtable to the object
field MonoClassField describing the field to fetch information from
value where the value is returned
Description
-

- Use this routine to get the value of the static field field value. -

- The pointer provided by value must be of the field type, for reference - types this is a MonoObject*, for value types its the actual pointer to - the value type. -

- For example: - int i; - mono_field_static_get_value (vt, int_field, &i);

+
vt vtable to the object
field MonoClassField describing the field to fetch information from
value where the value is returned
Description
+
Use this routine to get the value of the static field field value.

The pointer provided by value must be of the field type, for reference types this is a MonoObject*, for value types its the actual pointer to the value type.

For example: 

 	     int i; 	
 	     mono_field_static_get_value (vt, int_field, &i);
@@ -1422,12 +1201,8 @@ mono_field_static_set_value (MonoVTable *vt, MonoClassField *field, void *value)

Parameters
-
field MonoClassField describing the field to set
value The value to be set
Description
-

- Sets the value of the static field described by field - to the value passed in value. -

- The value must be on the native format of the field type.

+
field MonoClassField describing the field to set
value The value to be set
Description
+
Sets the value of the static field described by field to the value passed in value. The value must be in the native format of the field type.
@@ -1441,8 +1216,16 @@ mono_field_static_set_value (MonoVTable *vt, MonoClassField *field, void *value)
Syntax
-
mono_field_get_object
+
MonoReflectionField* +mono_field_get_object (MonoDomain *domain, MonoClass *klass, MonoClassField *field) + +

+

Parameters
+
domain an app domain
klass a type
field a field
Return value
+
A System.Reflection.MonoField object representing the field field + + in class klass.
@@ -1466,9 +1249,9 @@ mono_property_get_object_checked (MonoDomain *domain, MonoClass *klass, MonoProp

Parameters
-
domain an app domain
klass a type
property a property
error set on error
Description
-

- Return an System.Reflection.MonoProperty object representing the property property +
domain an app domain
klass a type
property a property
error set on error

Return value
+
a System.Reflection.MonoProperty object representing the property property + in class klass. On error returns NULL and sets error.
@@ -1489,14 +1272,11 @@ mono_property_get_flags (MonoProperty *prop)

Parameters
-
prop the MonoProperty to act on.
Return value
-
The flags for the property. +
prop the MonoProperty to act on.
Return value
+
The flags for the property.
Description
-

- The metadata flags for a property are encoded using the - PROPERTY_ATTRIBUTE_* constants. See the tabledefs.h file for details. -

+

The metadata flags for a property are encoded using the PROPERTY_ATTRIBUTE_* constants. See the tabledefs.h file for details.

@@ -1516,11 +1296,9 @@ mono_property_get_get_method (MonoProperty *prop)

Parameters
-
prop the MonoProperty to act on.
Return value
-
The setter method of the property (A MonoMethod) +
prop the MonoProperty to act on.
Return value
+
The getter method of the property (A MonoMethod)
-
Description
-

@@ -1555,11 +1333,9 @@ mono_property_get_parent (MonoProperty *prop)

Parameters
-
prop the MonoProperty to act on.
Return value
-
The MonoClass where the property was defined. +
prop the MonoProperty to act on.
Return value
+
The MonoClass where the property was defined.
-
Description
-

@@ -1579,11 +1355,9 @@ mono_property_get_set_method (MonoProperty *prop)

Parameters
-
prop the MonoProperty to act on.
Return value
-
The setter method of the property (A MonoMethod) +
prop the MonoProperty to act on.
Return value
+
The setter method of the property, a MonoMethod.
-
Description
-

@@ -1603,19 +1377,11 @@ mono_property_get_value (MonoProperty *prop, void *obj, void **params, MonoObjec

Parameters
-
prop MonoProperty to fetch
obj instance object on which to act
params parameters to pass to the propery
exc optional exception
Return value
-
the value from invoking the get method on the property. +
prop MonoProperty to fetch
obj instance object on which to act
params parameters to pass to the propery
exc optional exception
Return value
+
the value from invoking the get method on the property.
Description
-

- Invokes the property's get method with the given arguments on the - object instance obj (or NULL for static properties). -

- You can pass NULL as the exc argument if you don't want to - catch exceptions, otherwise, *exc will be set to the exception - thrown, if any. if an exception is thrown, you can't use the - MonoObject* result from the function. -

+
Invokes the property's get method with the given arguments on the object instance obj (or NULL for static properties).

You can pass NULL as the exc argument if you don't want to catch exceptions, otherwise, *exc will be set to the exception thrown, if any. if an exception is thrown, you can't use the MonoObject* result from the function.

@@ -1635,15 +1401,8 @@ mono_property_set_value (MonoProperty *prop, void *obj, void **params, MonoObjec

Parameters
-
prop MonoProperty to set
obj instance object on which to act
params parameters to pass to the propery
exc optional exception
Description
-

- Invokes the property's set method with the given arguments on the - object instance obj (or NULL for static properties). -

- You can pass NULL as the exc argument if you don't want to - catch exceptions, otherwise, *exc will be set to the exception - thrown, if any. if an exception is thrown, you can't use the - MonoObject* result from the function.

+
prop MonoProperty to set
obj instance object on which to act
params parameters to pass to the propery
exc optional exception
Description
+
Invokes the property's set method with the given arguments on the object instance obj (or NULL for static properties).

You can pass NULL as the exc argument if you don't want to catch exceptions, otherwise, *exc will be set to the exception thrown, if any. if an exception is thrown, you can't use the MonoObject* result from the function.

@@ -1661,8 +1420,16 @@ mono_property_set_value (MonoProperty *prop, void *obj, void **params, MonoObjec
Syntax
-
mono_event_get_object
+
MonoReflectionEvent* +mono_event_get_object (MonoDomain *domain, MonoClass *klass, MonoEvent *event) + +

+

Parameters
+
domain an app domain
klass a type
event a event
Return value
+
A System.Reflection.MonoEvent object representing the event event + + in class klass.
@@ -1682,11 +1449,9 @@ mono_event_get_add_method (MonoEvent *event)

Parameters
-
event The MonoEvent to act on.
Return value
-
The add' method for the event (a MonoMethod). +
event The MonoEvent to act on.
Return value
+
The add method for the event, a MonoMethod.
-
Description
-

@@ -1706,14 +1471,11 @@ mono_event_get_flags (MonoEvent *event)

Parameters
-
event the MonoEvent to act on.
Return value
-
The flags for the event. +
event the MonoEvent to act on.
Return value
+
The flags for the event.
Description
-

- The metadata flags for an event are encoded using the - EVENT_* constants. See the tabledefs.h file for details. -

+

The metadata flags for an event are encoded using the EVENT_* constants. See the tabledefs.h file for details.

@@ -1733,11 +1495,9 @@ mono_event_get_name (MonoEvent *event)

Parameters
-
event the MonoEvent to act on
Return value
-
The name of the event. +
event the MonoEvent to act on
Return value
+
The name of the event.
-
Description
-

@@ -1757,11 +1517,9 @@ mono_event_get_parent (MonoEvent *event)

Parameters
-
event the MonoEvent to act on.
Return value
-
The MonoClass where the event is defined. +
event the MonoEvent to act on.
Return value
+
The MonoClass where the event is defined.
-
Description
-

@@ -1781,11 +1539,9 @@ mono_event_get_raise_method (MonoEvent *event)

Parameters
-
event The MonoEvent to act on.
Return value
-
The raise method for the event (a MonoMethod). +
event The MonoEvent to act on.
Return value
+
The raise method for the event, a MonoMethod.
-
Description
-

@@ -1805,11 +1561,9 @@ mono_event_get_remove_method (MonoEvent *event)

Parameters
-
event The MonoEvent to act on.
Return value
-
The remove method for the event (a MonoMethod). +
event The MonoEvent to act on.
Return value
+
The remove method for the event, a MonoMethod.
-
Description
-

@@ -1832,16 +1586,11 @@ mono_load_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *

Parameters
-
this pointer to an object
klass klass of the object containing field
field the field to load
res a storage to store the result
Return value
-
an address pointing to the value of field. +
this pointer to an object
klass klass of the object containing field
field the field to load
res a storage to store the result
Return value
+
an address pointing to the value of field.
Description
-

- This method is called by the runtime on attempts to load fields of - transparent proxy objects. this points to such TP, klass is the class of - the object containing field. res is a storage location which can be - used to store the result. -

+
This method is called by the runtime on attempts to load fields of transparent proxy objects. this points to such TP, klass is the class of the object containing field. res is a storage location which can be used to store the result.
@@ -1861,9 +1610,8 @@ mono_load_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassFie

Parameters
-
this
klass
field
Description
-

- Missing documentation.

+
this
klass
field
Description
+
Missing documentation.
@@ -1883,11 +1631,8 @@ mono_store_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField

Parameters
-
this_obj pointer to an object
klass klass of the object containing field
field the field to load
val the value/object to store
Description
-

- This method is called by the runtime on attempts to store fields of - transparent proxy objects. this_obj points to such TP, klass is the class of - the object containing field. val is the new value to store in field.

+
this_obj pointer to an object
klass klass of the object containing field
field the field to load
val the value/object to store
Description
+
This method is called by the runtime on attempts to store fields of transparent proxy objects. this_obj points to such TP, klass is the class of the object containing field. val is the new value to store in field.
@@ -1907,9 +1652,8 @@ mono_store_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassFi

Parameters
-
this_obj
klass
field
arg
Description
-

- Missing documentation

+
this_obj
klass
field
arg
Description
+
Missing documentation
@@ -1932,13 +1676,8 @@ mono_get_delegate_begin_invoke (MonoClass *klass)

Parameters
-
klass The delegate class
Return value
-
the MonoMethod for the "BeginInvoke" method in the delegate klass or NULL if klass is a broken delegate type +
klass The delegate class
Return value
+
the MonoMethod for the BeginInvoke method in the delegate class or NULL if klass is a broken delegate type
-
Description
-

- - - diff --git a/docs/deploy/mono-api-profiler.html b/docs/deploy/mono-api-profiler.html index cdea00f5b5..c8fc25581d 100644 --- a/docs/deploy/mono-api-profiler.html +++ b/docs/deploy/mono-api-profiler.html @@ -251,13 +251,8 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)

Parameters
-
prof a MonoProfiler structure pointer, or a pointer to a derived structure.
callback the function to invoke at shutdown
Description
-

- Use mono_profiler_install to activate profiling in the Mono runtime. - Typically developers of new profilers will create a new structure whose - first field is a MonoProfiler and put any extra information that they need - to access from the various profiling callbacks there. -

+
prof a MonoProfiler structure pointer, or a pointer to a derived structure.
callback the function to invoke at shutdown
Description
+
Use mono_profiler_install to activate profiling in the Mono runtime. Typically developers of new profilers will create a new structure whose first field is a MonoProfiler and put any extra information that they need to access from the various profiling callbacks there.
@@ -271,7 +266,10 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)
Syntax
-
mono_profiler_install_allocation
+
void +mono_profiler_install_allocation (MonoProfileAllocFunc callback) + +

@@ -286,7 +284,12 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)

Syntax
-
mono_profiler_install_appdomain
+
void +mono_profiler_install_appdomain (MonoProfileAppDomainFunc start_load, MonoProfileAppDomainResult end_load, + MonoProfileAppDomainFunc start_unload, MonoProfileAppDomainFunc end_unload) + + +

@@ -301,7 +304,11 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)

Syntax
-
mono_profiler_install_assembly
+
void +mono_profiler_install_assembly (MonoProfileAssemblyFunc start_load, MonoProfileAssemblyResult end_load, + MonoProfileAssemblyFunc start_unload, MonoProfileAssemblyFunc end_unload) + +

@@ -316,7 +323,11 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)

Syntax
-
mono_profiler_install_class
+
void +mono_profiler_install_class (MonoProfileClassFunc start_load, MonoProfileClassResult end_load, + MonoProfileClassFunc start_unload, MonoProfileClassFunc end_unload) + +

@@ -331,7 +342,10 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)

Syntax
-
mono_profiler_install_coverage_filter
+
void +mono_profiler_install_coverage_filter (MonoProfileCoverageFilterFunc callback) + +

@@ -352,11 +366,8 @@ mono_profiler_install_enter_leave (MonoProfileMethodFunc enter, MonoProfileMetho

Parameters
-
enter the routine to be called on each method entry
fleave the routine to be called each time a method returns
Description
-

- Use this routine to install routines that will be called everytime - a method enters and leaves. The routines will receive as an argument - the MonoMethod representing the method that is entering or leaving.

+
enter the routine to be called on each method entry
fleave the routine to be called each time a method returns
Description
+

Use this routine to install routines that will be called everytime a method enters and leaves. The routines will receive as an argument the MonoMethod representing the method that is entering or leaving.

@@ -376,10 +387,8 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho

Parameters
-
start the routine to be called when the JIT process starts.
end the routine to be called when the JIT process ends.
Description
-

- Use this routine to install routines that will be called when JIT - compilation of a method starts and completes.

+
start the routine to be called when the JIT process starts.
end the routine to be called when the JIT process ends.
Description
+

Use this routine to install routines that will be called when JIT compilation of a method starts and completes.

@@ -393,7 +402,11 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho
Syntax
-
mono_profiler_install_module
+
void +mono_profiler_install_module (MonoProfileModuleFunc start_load, MonoProfileModuleResult end_load, + MonoProfileModuleFunc start_unload, MonoProfileModuleFunc end_unload) + +

@@ -408,7 +421,10 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho

Syntax
-
mono_profiler_install_thread
+
void +mono_profiler_install_thread (MonoProfileThreadFunc start, MonoProfileThreadFunc end) + +

@@ -423,7 +439,10 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho

Syntax
-
mono_profiler_install_transition
+
void +mono_profiler_install_transition (MonoProfileMethodResult callback) + +

@@ -438,7 +457,10 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho

Syntax
-
mono_profiler_install_gc
+
void +mono_profiler_install_gc (MonoProfileGCFunc callback, MonoProfileGCResizeFunc heap_resize_callback) + +

@@ -453,7 +475,10 @@ mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMetho

Syntax
-
mono_profiler_install_statistical
+
void +mono_profiler_install_statistical (MonoProfileStatFunc callback) + +

@@ -474,17 +499,8 @@ mono_profiler_set_events (MonoProfileFlags events)

Parameters
-
events an ORed set of values made up of MONO_PROFILER_ flags
Description
-

- The events descriped in the events argument is a set of flags - that represent which profiling events must be triggered. For - example if you have registered a set of methods for tracking - JIT compilation start and end with mono_profiler_install_jit_compile, - you will want to pass the MONO_PROFILE_JIT_COMPILATION flag to - this routine. -

- You can call mono_profile_set_events more than once and you can - do this at runtime to modify which methods are invoked.

+
events an ORed set of values made up of MONO_PROFILER_ flags
Description
+
The events described in the events argument is a set of flags that represent which profiling events must be triggered. For example if you have registered a set of methods for tracking JIT compilation start and end with mono_profiler_install_jit_compile, you will want to pass the MONO_PROFILE_JIT_COMPILATION flag to this routine.

You can call mono_profile_set_events more than once and you can do this at runtime to modify which methods are invoked.

@@ -504,8 +520,7 @@ mono_profiler_get_events (void)

Description
-

- Returns a list of active events that will be intercepted.

+

Returns a list of active events that will be intercepted.

@@ -514,6 +529,3 @@ mono_profiler_get_events (void)

To support profiling modules that need to do code coverage analysis, the following routines is provided: - - - diff --git a/docs/deploy/mono-api-reflection.html b/docs/deploy/mono-api-reflection.html index 82c64e8e84..b768c7b527 100644 --- a/docs/deploy/mono-api-reflection.html +++ b/docs/deploy/mono-api-reflection.html @@ -198,7 +198,10 @@

Syntax
-
mono_custom_attrs_get_attr
+
MonoObject* +mono_custom_attrs_get_attr (MonoCustomAttrInfo *ainfo, MonoClass *attr_klass) + +

@@ -219,9 +222,9 @@ mono_reflection_assembly_get_assembly (MonoReflectionAssembly *refassembly)

Parameters
-
refassembly the System.Reflection.Assembly object
Description
-

- Returns the MonoAssembly* associated with the C# System.Reflection.Assembly object refassembly.

+
refassembly the System.Reflection.Assembly object
Return value
+
the MonoAssembly* associated with the C# System.Reflection.Assembly object refassembly. +
@@ -235,7 +238,10 @@ mono_reflection_assembly_get_assembly (MonoReflectionAssembly *refassembly)
Syntax
-
mono_reflection_free_type_info
+
void +mono_reflection_free_type_info (MonoTypeNameParse *info) + +

@@ -256,13 +262,11 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj

Parameters
-
ctor custom attribute constructor
ctorArgs arguments o the constructor
properties
propValues
fields
fieldValues
Return value
-
a Byte array representing the blob of data. +
ctor custom attribute constructor
ctorArgs arguments o the constructor
properties
propValues
fields
fieldValues
Return value
+
a Byte array representing the blob of data.
Description
-

- Creates the blob of data that needs to be saved in the metadata and that represents - the custom attributed described by ctor, ctorArgs etc.

+
Creates the blob of data that needs to be saved in the metadata and that represents the custom attributed described by ctor, ctorArgs etc.
@@ -276,8 +280,18 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_get_custom_attrs_by_type
+
MonoArray* +mono_reflection_get_custom_attrs_by_type (MonoObject *obj, MonoClass *attr_klass, MonoError *error) + +

+

Parameters
+
obj a reflection object handle
Return value
+
an array with all the custom attributes defined of the + + reflection handle obj. If attr_klass is non-NULL, only custom attributes + of that type are returned. The objects are fully build. Return NULL if a loading error + occurs.
@@ -291,8 +305,17 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_get_custom_attrs_data
+
MonoArray* +mono_reflection_get_custom_attrs_data (MonoObject *obj) + +

+

Parameters
+
obj a reflection obj handle
Return value
+
an array of System.Reflection.CustomAttributeData, + + which include information about attributes reflected on + types loaded using the Reflection Only methods
@@ -306,8 +329,17 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_get_custom_attrs
+
MonoArray* +mono_reflection_get_custom_attrs (MonoObject *obj) + +

+

Parameters
+
obj a reflection object handle
Return value
+
an array with all the custom attributes defined of the + + reflection handle obj. The objects are fully build. Return NULL if a loading error + occurs.
@@ -321,8 +353,15 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_get_token
+
guint32 +mono_reflection_get_token (MonoObject *obj_raw) + +

+

Return value
+
the metadata token of obj which should be an object + + representing a metadata element.
@@ -336,8 +375,13 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_get_type
+
MonoType* +mono_reflection_get_type (MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase, gboolean *type_resolve) +

+

Parameters
+
image a metadata context
info type description structure
ignorecase flag for case-insensitive string compares
type_resolve whenever type resolve was already tried
Description
+

Build a MonoType from the type description in info.

@@ -351,7 +395,10 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
Syntax
-
mono_reflection_parse_type
+
int +mono_reflection_parse_type (char *name, MonoTypeNameParse *info) + +

@@ -372,9 +419,9 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Parameters
-
reftype the System.Type object
Description
-

- Returns the MonoType* associated with the C# System.Type object reftype.

+
reftype the System.Type object
Return value
+
the MonoType* associated with the C# System.Type object reftype. +
@@ -388,8 +435,14 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)
Syntax
-
mono_reflection_type_from_name
+
MonoType* +mono_reflection_type_from_name (char *name, MonoImage *image) + +

+

Parameters
+
name type name.
image a metadata context (can be NULL).
Description
+

Retrieves a MonoType from its name. If the name is not fully qualified, it defaults to get the type from image or, if image is NULL or loading from it fails, uses corlib.

@@ -403,8 +456,20 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)
Syntax
-
mono_reflection_get_custom_attrs_info
+
MonoCustomAttrInfo* +mono_reflection_get_custom_attrs_info (MonoObject *obj) + +

+

Parameters
+
obj a reflection object handle
Return value
+
the custom attribute info for attributes defined for the + + reflection handle obj. The objects. +

+ FIXME this function leaks like a sieve for SRE objects.

+
Description
+

@@ -421,7 +486,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)
Syntax
-
mono_custom_attrs_construct
+
MonoArray* +mono_custom_attrs_construct (MonoCustomAttrInfo *cinfo) + +

@@ -436,7 +504,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Syntax
-
mono_custom_attrs_free
+
void +mono_custom_attrs_free (MonoCustomAttrInfo *ainfo) + +

@@ -451,7 +522,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Syntax
-
mono_custom_attrs_from_assembly
+
MonoCustomAttrInfo* +mono_custom_attrs_from_assembly (MonoAssembly *assembly) + +

@@ -466,7 +540,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Syntax
-
mono_custom_attrs_from_class
+
MonoCustomAttrInfo* +mono_custom_attrs_from_class (MonoClass *klass) + +

@@ -481,7 +558,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Syntax
-
mono_custom_attrs_from_event
+
MonoCustomAttrInfo* +mono_custom_attrs_from_event (MonoClass *klass, MonoEvent *event) + +

@@ -496,7 +576,10 @@ mono_reflection_type_get_type (MonoReflectionType *reftype)

Syntax
-
mono_custom_attrs_from_field
+
MonoCustomAttrInfo* +mono_custom_attrs_from_field (MonoClass *klass, MonoClassField *field) + +

@@ -517,10 +600,10 @@ mono_custom_attrs_from_index (MonoImage *image, guint32 idx)

Return value
-
NULL if no attributes are found or if a loading error occurs. +
NULL if no attributes are found or if a loading error occurs.
Description
-

+

@@ -534,7 +617,10 @@ mono_custom_attrs_from_index (MonoImage *image, guint32 idx)
Syntax
-
mono_custom_attrs_from_method
+
MonoCustomAttrInfo* +mono_custom_attrs_from_method (MonoMethod *method) + +

@@ -555,13 +641,11 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Parameters
-
method handle to the method that we want to retrieve custom parameter information from
param parameter number, where zero represent the return value, and one is the first parameter in the method
Return value
-
the custom attribute object for the specified parameter, or NULL if there are none. +
method handle to the method that we want to retrieve custom parameter information from
param parameter number, where zero represent the return value, and one is the first parameter in the method
Return value
+
the custom attribute object for the specified parameter, or NULL if there are none.
Description
-

- The result must be released with mono_custom_attrs_free(). -

+

The result must be released with mono_custom_attrs_free().

@@ -575,7 +659,10 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
Syntax
-
mono_custom_attrs_from_property
+
MonoCustomAttrInfo* +mono_custom_attrs_from_property (MonoClass *klass, MonoProperty *property) + +

@@ -590,7 +677,10 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Syntax
-
mono_custom_attrs_has_attr
+
gboolean +mono_custom_attrs_has_attr (MonoCustomAttrInfo *ainfo, MonoClass *attr_klass) + +

@@ -607,7 +697,10 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Syntax
-
mono_module_file_get_object
+
MonoReflectionModule* +mono_module_file_get_object (MonoDomain *domain, MonoImage *image, int table_index) + +

@@ -622,7 +715,10 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Syntax
-
mono_module_get_object
+
MonoReflectionModule* +mono_module_get_object (MonoDomain *domain, MonoImage *image) + +

@@ -637,8 +733,15 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Syntax
-
mono_method_body_get_object
+
MonoReflectionMethodBody* +mono_method_body_get_object (MonoDomain *domain, MonoMethod *method) + +

+

Parameters
+
domain an app domain
method a method
Return value
+
A System.Reflection.MethodBody object representing the method method. +
@@ -652,8 +755,16 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
Syntax
-
mono_event_get_object
+
MonoReflectionEvent* +mono_event_get_object (MonoDomain *domain, MonoClass *klass, MonoEvent *event) + +

+

Parameters
+
domain an app domain
klass a type
event a event
Return value
+
A System.Reflection.MonoEvent object representing the event event + + in class klass.
@@ -667,8 +778,15 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
Syntax
-
mono_assembly_get_object
+
MonoReflectionAssembly* +mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly) + +

+

Parameters
+
domain an app domain
assembly an assembly
Return value
+
a System.Reflection.Assembly object representing the MonoAssembly assembly. +
@@ -682,7 +800,10 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
Syntax
-
mono_param_get_objects
+
MonoArray* +mono_param_get_objects (MonoDomain *domain, MonoMethod *method) + +

@@ -697,8 +818,16 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)

Syntax
-
mono_field_get_object
+
MonoReflectionField* +mono_field_get_object (MonoDomain *domain, MonoClass *klass, MonoClassField *field) + +

+

Parameters
+
domain an app domain
klass a type
field a field
Return value
+
A System.Reflection.MonoField object representing the field field + + in class klass.
@@ -718,12 +847,9 @@ mono_property_get_object_checked (MonoDomain *domain, MonoClass *klass, MonoProp

Parameters
-
domain an app domain
klass a type
property a property
error set on error
Description
-

- Return an System.Reflection.MonoProperty object representing the property property +
domain an app domain
klass a type
property a property
error set on error

Return value
+
a System.Reflection.MonoProperty object representing the property property + in class klass. On error returns NULL and sets error.
- - - diff --git a/docs/deploy/mono-api-security.html b/docs/deploy/mono-api-security.html index 73c2eecabd..dd82b10124 100644 --- a/docs/deploy/mono-api-security.html +++ b/docs/deploy/mono-api-security.html @@ -200,8 +200,17 @@
Syntax
-
mono_declsec_flags_from_assembly
+
guint32 +mono_declsec_flags_from_assembly (MonoAssembly *assembly) + +

+

Parameters
+
assembly The assembly for which we want the declarative security flags.
Return value
+
the declarative security flags for the assembly. +
+
Description
+
Get the security actions (in the form of flags) associated with the specified assembly.
@@ -215,8 +224,17 @@
Syntax
-
mono_declsec_flags_from_class
+
guint32 +mono_declsec_flags_from_class (MonoClass *klass) + +

+

Parameters
+
klass The class for which we want the declarative security flags.
Return value
+
the declarative security flags for the class. +
+
Description
+
Get the security actions (in the form of flags) associated with the specified class. We cache the flags inside the MonoClass structure as this will get called very often (at least for each method).
@@ -230,8 +248,17 @@
Syntax
-
mono_declsec_flags_from_method
+
guint32 +mono_declsec_flags_from_method (MonoMethod *method) + +

+

Parameters
+
method The method for which we want the declarative security flags.
Return value
+
the declarative security flags for the method (only). +
+
Description
+
Get the security actions (in the form of flags) associated with the specified method. To keep MonoMethod size down we do not cache the declarative security flags (except for the stack modifiers which are kept in the MonoJitInfo structure)
@@ -245,7 +272,10 @@
Syntax
-
mono_declsec_get_assembly_action
+
MonoBoolean +mono_declsec_get_assembly_action (MonoAssembly *assembly, guint32 action, MonoDeclSecurityEntry *entry) + +

@@ -260,7 +290,10 @@

Syntax
-
mono_declsec_get_class_action
+
MonoBoolean +mono_declsec_get_class_action (MonoClass *klass, guint32 action, MonoDeclSecurityEntry *entry) + +

@@ -275,8 +308,13 @@

Syntax
-
mono_declsec_get_demands
+
MonoBoolean +mono_declsec_get_demands (MonoMethod *method, MonoDeclSecurityActions* demands) + +

+

Description
+
Collect all actions (that requires to generate code in mini) assigned for the specified method. Don't use the content of actions if the function return FALSE.
@@ -290,8 +328,17 @@
Syntax
-
mono_declsec_get_inheritdemands_class
+
MonoBoolean +mono_declsec_get_inheritdemands_class (MonoClass *klass, MonoDeclSecurityActions* demands) + +

+

Parameters
+
klass The inherited class - this is the class that provides the security check (attributes)
demands
Return value
+
TRUE if inheritance demands (any kind) are present, FALSE otherwise. +
+
Description
+
Collect all Inherit actions - InheritanceDemand, NonCasInheritanceDemand and InheritanceDemandChoice (2.0). Don't use the content of actions if the function return FALSE.
@@ -305,8 +352,14 @@
Syntax
-
mono_declsec_get_inheritdemands_method
+
MonoBoolean +mono_declsec_get_inheritdemands_method (MonoMethod *method, MonoDeclSecurityActions* demands) + +

+

Parameters
+
actions InheritanceDemand, NonCasInheritanceDemand and InheritanceDemandChoice (2.0).
Description
+
Don't use the content of actions if the function return FALSE.
@@ -320,10 +373,13 @@
Syntax
-
mono_declsec_get_linkdemands
+
MonoBoolean +mono_declsec_get_linkdemands (MonoMethod *method, MonoDeclSecurityActions* klass, MonoDeclSecurityActions *cmethod) + +

+

Parameters
+
actions LinkDemand, NonCasLinkDemand and LinkDemandChoice (2.0).
Description
+
Don't use the content of actions if the function return FALSE.
- - - diff --git a/docs/deploy/mono-api-string.html b/docs/deploy/mono-api-string.html index 922a5bbc15..b8aa8e1726 100644 --- a/docs/deploy/mono-api-string.html +++ b/docs/deploy/mono-api-string.html @@ -202,34 +202,6 @@ typedef struct { gunichar2 chars [0]; } MonoString; -MonoString* mono_string_new (MonoDomain *domain, - const char *text); -MonoString* mono_string_new_len (MonoDomain *domain, - const char *text, - guint length); -MonoString* mono_string_new_size (MonoDomain *domain, - gint32 len); -MonoString* mono_string_new_utf16 (MonoDomain *domain, - const guint16 *text, - gint32 len); -MonoString* mono_string_new_utf32 (MonoDomain *domain, - const mono_unichar4 *text, - gint32 len); -MonoString* mono_string_from_utf16 (gunichar2 *data); -MonoString* mono_string_from_utf32 (mono_unichar4 *data); -mono_unichar2* mono_string_to_utf16 (MonoString *s); -char* mono_string_to_utf8 (MonoString *s); -char* mono_string_to_utf8_checked (MonoString *s, - MonoError *error); -mono_unichar4* mono_string_to_utf32 (MonoString *s); -gboolean mono_string_equal (MonoString *s1, - MonoString *s2); -guint mono_string_hash (MonoString *s); -MonoString* mono_string_intern (MonoString *str); -MonoString* mono_string_is_interned (MonoString *o); -MonoString* mono_string_new_wrapper (const char *text); -gunichar2* mono_string_chars (MonoString *s); -int mono_string_length (MonoString *s); @@ -265,15 +237,11 @@ mono_string_new (MonoDomain *domain, const char *text)

Parameters
-
text a pointer to an utf8 string
Return value
-
A newly created string object which contains text. - -

- This function asserts if it cannot allocate a new string. -

- deprecated Use mono_string_new_checked in new code.

+
text a pointer to a UTF-8 string
Return value
+
A newly created string object which contains text. +
Description
-

+
This function asserts if it cannot allocate a new string.
@@ -293,11 +261,9 @@ mono_string_new_len (MonoDomain *domain, const char *text, guint length)

Parameters
-
text a pointer to an utf8 string
length number of bytes in text to consider
Return value
-
A newly created string object which contains text. +
text a pointer to an utf8 string
length number of bytes in text to consider
Return value
+
A newly created string object which contains text.
-
Description
-

@@ -317,11 +283,9 @@ mono_string_new_size (MonoDomain *domain, gint32 len)

Parameters
-
text a pointer to an utf16 string
len the length of the string
Return value
-
A newly created string object of len +
text a pointer to a UTF-16 string
len the length of the string
Return value
+
A newly created string object of len
-
Description
-

@@ -341,11 +305,9 @@ mono_string_new_utf16 (MonoDomain *domain, const guint16 *text, gint32 len)

Parameters
-
text a pointer to an utf16 string
len the length of the string
Return value
-
A newly created string object which contains text. +
text a pointer to an utf16 string
len the length of the string
Return value
+
A newly created string object which contains text.
-
Description
-

@@ -365,11 +327,9 @@ mono_string_new_utf32 (MonoDomain *domain, const mono_unichar4 *text, gint32 len

Parameters
-
text a pointer to an utf32 string
len the length of the string
Return value
-
A newly created string object which contains text. +
text a pointer to a UTF-32 string
len the length of the string
Return value
+
A newly created string object which contains text.
-
Description
-

@@ -389,13 +349,11 @@ mono_string_from_utf16 (gunichar2 *data)

Parameters
-
data the UTF16 string (LPWSTR) to convert
Return value
-
a MonoString. +
data the UTF-16 string (LPWSTR) to convert
Return value
+
a MonoString.
Description
-

- Converts a NULL terminated UTF16 string (LPWSTR) to a MonoString. -

+
Converts a NULL-terminated UTF-16 string (LPWSTR) to a MonoString.
@@ -415,13 +373,11 @@ mono_string_from_utf32 (mono_unichar4 *data)

Parameters
-
data the UTF32 string (LPWSTR) to convert
Return value
-
a MonoString. +
data the UTF-32 string (LPWSTR) to convert
Return value
+
a MonoString.
Description
-

- Converts a UTF32 (UCS-4)to a MonoString. -

+
Converts a UTF-32 (UCS-4) string to a MonoString.
@@ -444,19 +400,19 @@ mono_string_to_utf16 (MonoString *s)

Parameters
-
s a MonoString
Description
-

- Return an null-terminated array of the utf-16 chars - contained in s. The result must be freed with g_free(). +
s a MonoString

Return value
+
a null-terminated array of the UTF-16 chars + + contained in s. The result must be freed with g_free(). This is a temporary helper until our string implementation - is reworked to always include the null terminating char.
+ is reworked to always include the null-terminating char.
-
mono_string_to_utf8
+
mono_string_to_utf8

Deprecated: Use mono_string_to_utf8_checked to avoid having an exception arbitrarily raised.
@@ -469,12 +425,10 @@ mono_string_to_utf8 (MonoString *s)

Parameters
-
s a System.String
Description
-

- Returns the UTF8 representation for s. - The resulting buffer needs to be freed with mono_free(). -

- deprecated Use mono_string_to_utf8_checked to avoid having an exception arbritraly raised.

+
s a System.String
Return value
+
the UTF-8 representation for s. + + The resulting buffer needs to be freed with mono_free().
@@ -494,11 +448,8 @@ mono_string_to_utf8_checked (MonoString *s, MonoError *error)

Parameters
-
s a System.String
error a MonoError.
Description
-

- Converts a MonoString to its UTF8 representation. May fail; check - error to determine whether the conversion was successful. - The resulting buffer should be freed with mono_free().

+
s a System.String
error a MonoError.
Description
+
Converts a MonoString to its UTF-8 representation. May fail; check error to determine whether the conversion was successful. The resulting buffer should be freed with mono_free().
@@ -518,10 +469,10 @@ mono_string_to_utf32 (MonoString *s)

Parameters
-
s a MonoString
Description
-

- Return an null-terminated array of the UTF-32 (UCS-4) chars - contained in s. The result must be freed with g_free().

+
s a MonoString
Return value
+
a null-terminated array of the UTF-32 (UCS-4) chars + + contained in s. The result must be freed with g_free().
@@ -544,11 +495,11 @@ mono_string_equal (MonoString *s1, MonoString *s2)

Parameters
-
s1 First string to compare
s2 Second string to compare
Description
-

- Compares two MonoString* instances ordinally for equality. -

- Returns FALSE if the strings differ.

+
s1 First string to compare
s2 Second string to compare
Return value
+
FALSE if the strings differ. +
+
Description
+

Compares two MonoString* instances ordinally for equality.

@@ -568,10 +519,11 @@ mono_string_hash (MonoString *s)

Parameters
-
s the string to hash
Description
-

- Compute the hash for a MonoString* - Returns the hash for the string.

+
s the string to hash
Return value
+
the hash for the string. +
+
Description
+

Compute the hash for a MonoString*

@@ -591,12 +543,11 @@ mono_string_intern (MonoString *str)

Parameters
-
o String to intern
Return value
-
The interned string. +
o String to intern
Return value
+
The interned string.
Description
-

- Interns the string passed.

+
Interns the string passed.
@@ -616,9 +567,9 @@ mono_string_is_interned (MonoString *o)

Parameters
-
o String to probe
Description
-

- Returns whether the string has been interned.

+
o String to probe
Return value
+
Whether the string has been interned. +
@@ -638,9 +589,8 @@ mono_string_new_wrapper (const char *text)

Parameters
-
text pointer to utf8 characters.
Description
-

- Helper function to create a string object from text in the current domain.

+
text pointer to UTF-8 characters.
Description
+
Helper function to create a string object from text in the current domain.
@@ -660,11 +610,8 @@ mono_string_chars (MonoString *s)

Parameters
-
s a MonoString
Description
-

- Returns a pointer to the UCS16 characters stored in the MonoString

+
s a MonoString
Return value
+
a pointer to the UTF-16 characters stored in the MonoString +
- - - diff --git a/docs/deploy/mono-api-threads.html b/docs/deploy/mono-api-threads.html index 8ca7554d32..2b4bd5ce0a 100644 --- a/docs/deploy/mono-api-threads.html +++ b/docs/deploy/mono-api-threads.html @@ -199,7 +199,10 @@
Syntax
-
mono_thread_attach
+
MonoThread* +mono_thread_attach (MonoDomain *domain) + +

@@ -214,7 +217,10 @@

Syntax
-
mono_thread_create
+
void +mono_thread_create (MonoDomain *domain, gpointer func, gpointer arg) + +

@@ -229,7 +235,10 @@

Syntax
-
mono_thread_current
+
MonoThread* +mono_thread_current (void) + +

@@ -244,7 +253,10 @@

Syntax
-
mono_thread_detach
+
void +mono_thread_detach (MonoThread *thread) + +

@@ -259,7 +271,10 @@

Syntax
-
mono_thread_exit
+
void +mono_thread_exit (void) + +

@@ -274,8 +289,15 @@

Syntax
-
mono_thread_get_managed_id
+
int32_t +mono_thread_get_managed_id (MonoThread *thread) + +

+

Return value
+
the Thread.ManagedThreadId value of thread. + + Returns -1 if thread is NULL.
@@ -289,8 +311,16 @@
Syntax
-
mono_thread_get_name_utf8
+
char* +mono_thread_get_name_utf8 (MonoThread *thread) + +

+

Return value
+
the name of the thread in UTF-8. + + Return NULL if the thread has no name. + The returned memory is owned by the caller.
@@ -304,8 +334,17 @@
Syntax
-
mono_thread_is_foreign
+
mono_bool +mono_thread_is_foreign (MonoThread *thread) + +

+

Parameters
+
thread the thread to query
Return value
+
TRUE if thread was not created by the runtime. +
+
Description
+

This function allows one to determine if a thread was created by the mono runtime and has a well defined lifecycle or it's a foreign one, created by the native environment.

@@ -319,7 +358,10 @@
Syntax
-
mono_thread_manage
+
void +mono_thread_manage (void) + +

@@ -334,7 +376,10 @@

Syntax
-
mono_thread_new_init
+
void +mono_thread_new_init (intptr_t tid, gpointer stack_start, gpointer func) + +

@@ -349,7 +394,10 @@

Syntax
-
mono_threads_get_default_stacksize
+
guint32 +mono_threads_get_default_stacksize (void) + +

@@ -364,7 +412,10 @@

Syntax
-
mono_threads_set_default_stacksize
+
void +mono_threads_set_default_stacksize (guint32 stacksize) + +

@@ -379,7 +430,10 @@

Syntax
-
mono_thread_set_manage_callback
+
void +mono_thread_set_manage_callback (MonoThread *thread, MonoThreadManageCallback func) + +

@@ -394,7 +448,10 @@

Syntax
-
mono_thread_stop
+
void +mono_thread_stop (MonoThread *thread) + +

@@ -410,7 +467,10 @@

Syntax
-
mono_thread_get_main
+
MonoThread* +mono_thread_get_main (void) + +

@@ -431,12 +491,8 @@ mono_thread_set_main (MonoThread *thread)

Parameters
-
thread thread to set as the main thread
Description
-

- This function can be used to instruct the runtime to treat thread - as the main thread, ie, the thread that would normally execute the Main() - method. This basically means that at the end of thread, the runtime will - wait for the existing foreground threads to quit and other such details.

+
thread thread to set as the main thread
Description
+
This function can be used to instruct the runtime to treat thread as the main thread, ie, the thread that would normally execute the Main method. This basically means that at the end of thread, the runtime will wait for the existing foreground threads to quit and other such details.
@@ -453,7 +509,10 @@ mono_thread_set_main (MonoThread *thread)
Syntax
-
mono_monitor_enter
+
gboolean +mono_monitor_enter (MonoObject *obj) + +

@@ -468,7 +527,10 @@ mono_thread_set_main (MonoThread *thread)

Syntax
-
mono_monitor_enter_v4
+
void +mono_monitor_enter_v4 (MonoObject *obj, char *lock_taken) + +

@@ -483,7 +545,10 @@ mono_thread_set_main (MonoThread *thread)

Syntax
-
mono_monitor_exit
+
void +mono_monitor_exit (MonoObject *obj) + +

@@ -498,7 +563,10 @@ mono_thread_set_main (MonoThread *thread)

Syntax
-
mono_monitor_try_enter
+
gboolean +mono_monitor_try_enter (MonoObject *obj, guint32 ms) + +

@@ -516,7 +584,10 @@ mono_thread_set_main (MonoThread *thread)

Syntax
-
mono_thread_cleanup
+
void +mono_thread_cleanup (void) + +

@@ -531,10 +602,12 @@ mono_thread_set_main (MonoThread *thread)

Syntax
-
mono_thread_detach_if_exiting
+
mono_bool +mono_thread_detach_if_exiting (void) + +

+

Description
+

Detach the current thread from the runtime if it is exiting, i.e. it is running pthread dtors. This should be used at the end of embedding code which calls into managed code, and which can be called from pthread dtors, like dealloc: implementations in Objective-C.

- - - diff --git a/docs/deploy/mono-api-type.html b/docs/deploy/mono-api-type.html index 0398770aeb..5d9277b6b0 100644 --- a/docs/deploy/mono-api-type.html +++ b/docs/deploy/mono-api-type.html @@ -196,28 +196,6 @@ #include <metadata/class.h> typedef struct _MonoType MonoType; - mono_type_get_object - mono_type_create_from_typespec - mono_type_full_name -MonoArrayType* mono_type_get_array_type (MonoType *type); -MonoClass* mono_type_get_class (MonoType *type); - mono_type_get_modifiers -char* mono_type_get_name (MonoType *type); -MonoType* mono_type_get_ptr_type (MonoType *type); -MonoMethodSignature* mono_type_get_signature (MonoType *type); -int mono_type_get_type (MonoType *type); - mono_type_get_underlying_type -gboolean mono_type_is_byref (MonoType *type); -mono_bool mono_type_is_pointer (MonoType *type); -mono_bool mono_type_is_reference (MonoType *type); -mono_bool mono_type_is_struct (MonoType *type); -mono_bool mono_type_is_void (MonoType *type); - mono_type_size - mono_type_stack_size -guint32 mono_type_to_unmanaged (MonoType *type, - MonoMarshalSpec *mspec, - gboolean as_field; - mono_type_generic_inst_is_valuetype @@ -234,23 +212,36 @@ guint32 mono_type_to_unmanage
Syntax
-
mono_type_get_object
+
MonoReflectionType* +mono_type_get_object (MonoDomain *domain, MonoType *type) + +

+

Parameters
+
domain an app domain
type a type
Return value
+
A System.MonoType object representing the type type. +
-
mono_type_create_from_typespec
+
mono_type_create_from_typespec

Deprecated: use mono_type_create_from_typespec_checked that has proper error handling
Syntax
-
mono_type_create_from_typespec
+
MonoType* +mono_type_create_from_typespec (MonoImage *image, guint32 type_spec) + +

+

Parameters
+
image context where the image is created
type_spec typespec token
Description
+

Creates a MonoType representing the TypeSpec indexed by the type_spec token.

@@ -264,7 +255,10 @@ guint32 mono_type_to_unmanage
Syntax
-
mono_type_full_name
+
char* +mono_type_full_name (MonoType *type) + +

@@ -285,15 +279,13 @@ mono_type_get_array_type (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
a MonoArrayType struct describing the array type that type +
type the MonoType operated on
Return value
+
a MonoArrayType struct describing the array type that type represents. The info includes details such as rank, array element type and the sizes and bounds of multidimensional arrays.
Description
-

- It is only valid to call this function if type is a MONO_TYPE_ARRAY. -

+
It is only valid to call this function if type is a MONO_TYPE_ARRAY .
@@ -313,15 +305,11 @@ mono_type_get_class (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
the MonoClass pointer that describes the class that type represents. +
type the MonoType operated on
Return value
+
the MonoClass pointer that describes the class that type represents.
Description
-

- It is only valid to call this function if type is a MONO_TYPE_CLASS or a - MONO_TYPE_VALUETYPE. For more general functionality, use mono_class_from_mono_type (), - instead -

+
It is only valid to call this function if type is a MONO_TYPE_CLASS or a MONO_TYPE_VALUETYPE . For more general functionality, use mono_class_from_mono_type, instead.
@@ -335,7 +323,10 @@ mono_type_get_class (MonoType *type)
Syntax
-
mono_type_get_modifiers
+
MonoClass* +mono_type_get_modifiers (MonoType *type, gboolean *is_required, gpointer *iter) + +

@@ -356,11 +347,9 @@ mono_type_get_name (MonoType *type)

Parameters
-
type a type
Return value
-
The string representation for type as it would be represented in IL code. +
type a type
Return value
+
The string representation for type as it would be represented in IL code.
-
Description
-

@@ -379,16 +368,12 @@ mono_type_get_ptr_type (MonoType *type)

-

Parameters
-
type the MonoType operated on
Return value
-
the MonoType pointer that describes the type that type +
Return value
+
the MonoType pointer that describes the type that type represents a pointer to.
Description
-

- It is only valid to call this function if type is a MONO_TYPE_PTR. - instead -

+
\pararm type the MonoType operated on It is only valid to call this function if type is a MONO_TYPE_PTR .
@@ -408,14 +393,12 @@ mono_type_get_signature (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
the MonoMethodSignature pointer that describes the signature +
type the MonoType operated on
Return value
+
the MonoMethodSignature pointer that describes the signature of the function pointer type represents.
Description
-

- It is only valid to call this function if type is a MONO_TYPE_FNPTR. -

+
It is only valid to call this function if type is a MONO_TYPE_FNPTR .
@@ -435,12 +418,10 @@ mono_type_get_type (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
the IL type value for type. This is one of the MonoTypeEnum +
type the MonoType operated on
Return value
+
the IL type value for type. This is one of the MonoTypeEnum - enum members like MONO_TYPE_I4 or MONO_TYPE_STRING.
-
Description
-

+ enum members like MONO_TYPE_I4 or MONO_TYPE_STRING.
@@ -454,8 +435,16 @@ mono_type_get_type (MonoType *type)
Syntax
-
mono_type_get_underlying_type
+
MonoType* +mono_type_get_underlying_type (MonoType *type) + +

+

Parameters
+
type a type
Return value
+
The MonoType for the underlying integer type if type + + is an enum and byref is false, otherwise the type itself.
@@ -475,12 +464,10 @@ mono_type_is_byref (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
#TRUE if type represents a type passed by reference, +
type the MonoType operated on
Return value
+
TRUE if type represents a type passed by reference, - #FALSE otherwise.
-
Description
-

+ FALSE otherwise.
@@ -500,11 +487,9 @@ mono_type_is_pointer (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
#TRUE is type is a managed or unmanaged pointer type. #FALSE otherwise. +
type the MonoType operated on
Return value
+
TRUE if type is a managed or unmanaged pointer type. FALSE otherwise.
-
Description
-

@@ -524,11 +509,9 @@ mono_type_is_reference (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
#TRUE is type represents an object reference . #FALSE otherwise. +
type the MonoType operated on
Return value
+
TRUE if type represents an object reference. FALSE otherwise.
-
Description
-

@@ -548,12 +531,10 @@ mono_type_is_struct (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
#TRUE is type is a struct, that is a ValueType but not en enum +
type the MonoType operated on
Return value
+
TRUE if type is a struct, that is a ValueType but not an enum - or a basic type like System.Int32. #FALSE otherwise.
-
Description
-

+ or a basic type like System.Int32 . FALSE otherwise.
@@ -573,11 +554,9 @@ mono_type_is_void (MonoType *type)

Parameters
-
type the MonoType operated on
Return value
-
#TRUE is type is System.Void. #FALSE otherwise. +
type the MonoType operated on
Return value
+
TRUE if type is System.Void . FALSE otherwise.
-
Description
-

@@ -591,8 +570,16 @@ mono_type_is_void (MonoType *type)
Syntax
-
mono_type_size
+
int +mono_type_size (MonoType *t, int *align) + +

+

Parameters
+
t the type to return the size of
Return value
+
The number of bytes required to hold an instance of this + + type in memory
@@ -606,8 +593,16 @@ mono_type_is_void (MonoType *type)
Syntax
-
mono_type_stack_size
+
int +mono_type_stack_size (MonoType *t, int *align) + +

+

Parameters
+
t the type to return the size it uses on the stack
Return value
+
The number of bytes required to hold an instance of this + + type on the runtime stack
@@ -628,17 +623,10 @@ mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, gboolean as_fiel

Return value
-
A MonoMarshalNative enumeration value (MONO_NATIVE_) value +
A MonoMarshalNative enumeration value (MONO_NATIVE_) value - describing the underlying native reprensetation of the type. -

- In addition the value pointed by - "conv" will contain the kind of marshalling required for this - particular type one of the MONO_MARSHAL_CONV_ enumeration values.

+ describing the underlying native reprensetation of the type.
Description
-

+
The value pointed to by conv will contain the kind of marshalling required for this particular type one of the MONO_MARSHAL_CONV_ enumeration values.
- - - diff --git a/docs/deploy/mono-api-types.html b/docs/deploy/mono-api-types.html index d0ca23fe29..73f8400c3d 100644 --- a/docs/deploy/mono-api-types.html +++ b/docs/deploy/mono-api-types.html @@ -207,12 +207,10 @@ mono_get_object_class (void)

Return value
-
The MonoClass* for the System.Object type. +
The MonoClass* for the System.Object type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Object. -

+
Use this function to get the MonoClass* that the runtime is using for System.Object .
@@ -232,12 +230,10 @@ mono_get_int16_class (void)

Return value
-
The MonoClass* for the System.Int16 type. +
The MonoClass* for the System.Int16 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Int16. -

+
Use this function to get the MonoClass* that the runtime is using for System.Int16 .
@@ -257,12 +253,10 @@ mono_get_int32_class (void)

Return value
-
The MonoClass* for the System.Int32 type. +
The MonoClass* for the System.Int32 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Int32. -

+
Use this function to get the MonoClass* that the runtime is using for System.Int32 .
@@ -282,12 +276,10 @@ mono_get_int64_class (void)

Return value
-
The MonoClass* for the System.Int64 type. +
The MonoClass* for the System.Int64 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Int64. -

+
Use this function to get the MonoClass* that the runtime is using for System.Int64 .
@@ -307,12 +299,10 @@ mono_get_double_class (void)

Return value
-
The MonoClass* for the System.Double type. +
The MonoClass* for the System.Double type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Double (64-bit floating points). -

+
Use this function to get the MonoClass* that the runtime is using for System.Double (64-bit floating points).
@@ -332,12 +322,10 @@ mono_get_enum_class (void)

Return value
-
The MonoClass* for the System.Enum type. +
The MonoClass* for the System.Enum type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Enum. -

+
Use this function to get the MonoClass* that the runtime is using for System.Enum .
@@ -357,12 +345,10 @@ mono_get_intptr_class (void)

Return value
-
The MonoClass* for the System.IntPtr type. +
The MonoClass* for the System.IntPtr type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.IntPtr. -

+
Use this function to get the MonoClass* that the runtime is using for System.IntPtr .
@@ -382,12 +368,10 @@ mono_get_sbyte_class (void)

Return value
-
The MonoClass* for the System.SByte type. +
The MonoClass* for the System.SByte type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.SByte. -

+
Use this function to get the MonoClass* that the runtime is using for System.SByte.
@@ -407,12 +391,10 @@ mono_get_single_class (void)

Return value
-
The MonoClass* for the System.Single type. +
The MonoClass* for the System.Single type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Single (32-bit floating points). -

+
Use this function to get the MonoClass* that the runtime is using for System.Single (32-bit floating points).
@@ -432,12 +414,10 @@ mono_get_string_class (void)

Return value
-
The MonoClass* for the System.String type. +
The MonoClass* for the System.String type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.String. -

+
Use this function to get the MonoClass* that the runtime is using for System.String .
@@ -457,12 +437,10 @@ mono_get_thread_class (void)

Return value
-
The MonoClass* for the System.Threading.Thread type. +
The MonoClass* for the System.Threading.Thread type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Threading.Thread. -

+
Use this function to get the MonoClass* that the runtime is using for System.Threading.Thread .
@@ -482,12 +460,10 @@ mono_get_uint16_class (void)

Return value
-
The MonoClass* for the System.UInt16 type. +
The MonoClass* for the System.UInt16 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.UInt16. -

+
Use this function to get the MonoClass* that the runtime is using for System.UInt16 .
@@ -507,12 +483,10 @@ mono_get_uint32_class (void)

Return value
-
The MonoClass* for the System.UInt32 type. +
The MonoClass* for the System.UInt32 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.UInt32. -

+
Use this function to get the MonoClass* that the runtime is using for System.UInt32 .
@@ -532,12 +506,10 @@ mono_get_uint64_class (void)

Return value
-
The MonoClass* for the System.UInt64 type. +
The MonoClass* for the System.UInt64 type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.UInt64. -

+
Use this function to get the MonoClass* that the runtime is using for System.UInt64 .
@@ -557,12 +529,10 @@ mono_get_uintptr_class (void)

Return value
-
The MonoClass* for the System.UIntPtr type. +
The MonoClass* for the System.UIntPtr type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.UIntPtr. -

+
Use this function to get the MonoClass* that the runtime is using for System.UIntPtr .
@@ -582,12 +552,10 @@ mono_get_void_class (void)

Return value
-
The MonoClass* for the System.Void type. +
The MonoClass* for the System.Void type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Void. -

+
Use this function to get the MonoClass* that the runtime is using for System.Void .
@@ -607,12 +575,10 @@ mono_get_array_class (void)

Return value
-
The MonoClass* for the System.Array type. +
The MonoClass* for the System.Array type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Array. -

+
Use this function to get the MonoClass* that the runtime is using for System.Array .
@@ -632,12 +598,10 @@ mono_get_boolean_class (void)

Return value
-
The MonoClass* for the System.Boolean type. +
The MonoClass* for the System.Boolean type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Boolean. -

+
Use this function to get the MonoClass* that the runtime is using for System.Boolean .
@@ -657,12 +621,10 @@ mono_get_byte_class (void)

Return value
-
The MonoClass* for the System.Byte type. +
The MonoClass* for the System.Byte type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Byte. -

+
Use this function to get the MonoClass* that the runtime is using for System.Byte .
@@ -682,15 +644,10 @@ mono_get_char_class (void)

Return value
-
The MonoClass* for the System.Char type. +
The MonoClass* for the System.Char type.
Description
-

- Use this function to get the MonoClass* that the runtime is using for System.Char. -

+
Use this function to get the MonoClass* that the runtime is using for System.Char .
- - - diff --git a/docs/deploy/mono-api-unsorted.html b/docs/deploy/mono-api-unsorted.html index b7d320d32a..de3ffbf12b 100644 --- a/docs/deploy/mono-api-unsorted.html +++ b/docs/deploy/mono-api-unsorted.html @@ -204,12 +204,10 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)

Parameters
-
element_class element class
rank the dimension of the array class
bounded whenever the array has non-zero bounds
Return value
-
A class object describing the array with element type element_type and +
element_class element class
rank the dimension of the array class
bounded whenever the array has non-zero bounds
Return value
+
A class object describing the array with element type element_type and - dimension rank.
-
Description
-

+ dimension rank.
@@ -229,13 +227,11 @@ mono_check_corlib_version (void)

Return value
-
NULL if the runtime will work with the corlib, or a g_malloc +
NULL if the runtime will work with the corlib, or a g_malloc allocated string with the error otherwise.
Description
-

- Checks that the corlib that is loaded matches the version of this runtime. -

+
Checks that the corlib that is loaded matches the version of this runtime.
@@ -249,16 +245,14 @@ mono_check_corlib_version (void)
Syntax
-
gpointer -mono_compile_method_checked (MonoMethod *method, MonoError *error) +
gpointer +mono_compile_method (MonoMethod *method)

Parameters
-
method The method to compile.
error set on error.
Description
-

- This JIT-compiles the method, and returns the pointer to the native code - produced. On failure returns NULL and sets error.

+
method The method to compile.
Description
+
This JIT-compiles the method, and returns the pointer to the native code produced.
@@ -272,7 +266,10 @@ mono_compile_method_checked (MonoMethod *method, MonoError *error)
Syntax
-
mono_config_for_assembly
+
void +mono_config_for_assembly (MonoImage *assembly) + +

@@ -293,28 +290,8 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons

Parameters
-
assembly if NULL, this is a global mapping, otherwise the remapping of the dynamic library will only apply to the specified assembly
dll The name of the external library, as it would be found in the DllImport declaration. If prefixed with 'i:' the matching of the library name is done without case sensitivity
func if not null, the mapping will only applied to the named function (the value of EntryPoint)
tdll The name of the library to map the specified dll if it matches.
tfunc The name of the function that replaces the invocation. If NULL, it is replaced with a copy of func.
Description
-

- LOCKING: Acquires the loader lock. -

- This function is used to programatically add DllImport remapping in either - a specific assembly, or as a global remapping. This is done by remapping - references in a DllImport attribute from the dll library name into the tdll - name. If the dll name contains the prefix "i:", the comparison of the - library name is done without case sensitivity. -

- If you pass func, this is the name of the EntryPoint in a DllImport if specified - or the name of the function as determined by DllImport. If you pass func, you - must also pass tfunc which is the name of the target function to invoke on a match. -

- Example: - mono_dllmap_insert (NULL, "i:libdemo.dll", NULL, relocated_demo_path, NULL); -

- The above will remap DllImport statments for "libdemo.dll" and "LIBDEMO.DLL" to - the contents of relocated_demo_path for all assemblies in the Mono process. -

- NOTE: This can be called before the runtime is initialized, for example from - mono_config_parse ().

+
assembly if NULL, this is a global mapping, otherwise the remapping of the dynamic library will only apply to the specified assembly
dll The name of the external library, as it would be found in the DllImport declaration. If prefixed with i: the matching of the library name is done without case sensitivity
func if not null, the mapping will only applied to the named function (the value of EntryPoint)
tdll The name of the library to map the specified dll if it matches.
tfunc The name of the function that replaces the invocation. If NULL, it is replaced with a copy of func.
Description
+

LOCKING: Acquires the loader lock.

This function is used to programatically add DllImport remapping in either a specific assembly, or as a global remapping. This is done by remapping references in a DllImport attribute from the dll library name into the tdll name. If the dll name contains the prefix i:, the comparison of the library name is done without case sensitivity.

If you pass func, this is the name of the EntryPoint in a DllImport if specified or the name of the function as determined by DllImport. If you pass func, you must also pass tfunc which is the name of the target function to invoke on a match.

Example:

mono_dllmap_insert (NULL, "i:libdemo.dll", NULL, relocated_demo_path, NULL);

The above will remap DllImport statements for libdemo.dll and LIBDEMO.DLL to the contents of relocated_demo_path for all assemblies in the Mono process.

NOTE: This can be called before the runtime is initialized, for example from mono_config_parse.

@@ -328,7 +305,10 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons
Syntax
-
mono_free_method
+
void +mono_free_method (MonoMethod *method) + +

@@ -343,7 +323,10 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons

Syntax
-
mono_free_verify_list
+
void +mono_free_verify_list (GSList *list) + +

@@ -358,7 +341,10 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons

Syntax
-
mono_get_config_dir
+
const char* +mono_get_config_dir (void) + +

@@ -379,12 +365,10 @@ mono_get_corlib (void)

Return value
-
The MonoImage for mscorlib.dll +
The MonoImage for mscorlib.dll
Description
-

- Use this function to get the MonoImage* for the mscorlib.dll assembly -

+
Use this function to get the MonoImage* for the mscorlib.dll assembly
@@ -404,11 +388,9 @@ mono_get_delegate_invoke (MonoClass *klass)

Parameters
-
klass The delegate class
Return value
-
the MonoMethod for the "Invoke" method in the delegate klass or NULL if klass is a broken delegate type +
klass The delegate class
Return value
+
the MonoMethod for the Invoke method in the delegate class or NULL if klass is a broken delegate type
-
Description
-

@@ -422,7 +404,11 @@ mono_get_delegate_invoke (MonoClass *klass)
Syntax
-
mono_get_method_full
+
MonoMethod* +mono_get_method_full (MonoImage *image, guint32 token, MonoClass *klass, + MonoGenericContext *context) + +

@@ -437,7 +423,10 @@ mono_get_delegate_invoke (MonoClass *klass)

Syntax
-
mono_get_method
+
MonoMethod* +mono_get_method (MonoImage *image, guint32 token, MonoClass *klass) + +

@@ -458,15 +447,10 @@ mono_get_root_domain (void)

Return value
-
the root appdomain, to obtain the current domain, use mono_domain_get () +
the root appdomain, to obtain the current domain, use mono_domain_get ()
Description
-

- The root AppDomain is the initial domain created by the runtime when it is - initialized. Programs execute on this AppDomain, but can create new ones - later. Currently there is no unmanaged API to create new AppDomains, this - must be done from managed code. -

+

The root AppDomain is the initial domain created by the runtime when it is initialized. Programs execute on this AppDomain, but can create new ones later. Currently there is no unmanaged API to create new AppDomains, this must be done from managed code.

@@ -480,7 +464,10 @@ mono_get_root_domain (void)
Syntax
-
mono_lookup_internal_call
+
gpointer +mono_lookup_internal_call (MonoMethod *method) + +

@@ -495,7 +482,10 @@ mono_get_root_domain (void)

Syntax
-
mono_lookup_pinvoke_call
+
gpointer +mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char **exc_arg) + +

@@ -510,7 +500,10 @@ mono_get_root_domain (void)

Syntax
-
mono_parse_default_optimizations
+
int +mono_parse_default_optimizations (const char* p) + +

@@ -525,7 +518,10 @@ mono_get_root_domain (void)

Syntax
-
mono_ptr_class_get
+
MonoClass* +mono_ptr_class_get (MonoType *type) + +

@@ -540,7 +536,10 @@ mono_get_root_domain (void)

Syntax
-
mono_register_bundled_assemblies
+
void +mono_register_bundled_assemblies (const MonoBundledAssembly **assemblies) + +

@@ -555,8 +554,14 @@ mono_get_root_domain (void)

Syntax
-
mono_runtime_class_init
+
void +mono_runtime_class_init (MonoVTable *vtable) + +

+

Parameters
+
vtable vtable that needs to be initialized
Description
+
This routine calls the class constructor for vtable.
@@ -576,12 +581,8 @@ mono_runtime_cleanup (MonoDomain *domain)

Parameters
-
domain unused.
Description
-

- Internal routine. -

- This must not be called while there are still running threads executing - managed code.

+
domain unused.
Description
+

Internal routine.

This must not be called while there are still running threads executing managed code.

@@ -596,17 +597,13 @@ mono_runtime_cleanup (MonoDomain *domain)
Syntax
MonoArray* -mono_runtime_get_main_args_checked (MonoError *error) +mono_runtime_get_main_args (void)

-

Parameters
-
error set on error
Return value
-
a MonoArray with the arguments passed to the main - - program. On failure returns NULL and sets error.
-
Description
-

+
Return value
+
A MonoArray with the arguments passed to the main program +
@@ -626,15 +623,8 @@ mono_runtime_init (MonoDomain *domain, MonoThreadStartCB start_cb, MonoThreadAtt

Parameters
-
domain domain returned by mono_init ()
Description
-

- Initialize the core AppDomain: this function will run also some - IL initialization code, so it needs the execution engine to be fully - operational. -

- AppDomain.SetupInformation is set up in mono_runtime_exec_main, where - we know the entry_assembly. -

+
domain domain returned by mono_init
Description
+

Initialize the core AppDomain: this function will run also some IL initialization code, so it needs the execution engine to be fully operational.

AppDomain.SetupInformation is set up in mono_runtime_exec_main, where we know the entry_assembly.

@@ -653,13 +643,10 @@ mono_runtime_is_shutting_down (void)

-

Description
-

- Returns whether the runtime has been flagged for shutdown. -

- This is consumed by the P:System.Environment.HasShutdownStarted - property. -

+
Parameters
+
PSystem.Environment.HasShutdownStarted property.
Return value
+
whether the runtime has been flagged for shutdown. +
@@ -679,10 +666,8 @@ mono_runtime_object_init (MonoObject *this_obj)

Parameters
-
this_obj the object to initialize
Description
-

- This function calls the zero-argument constructor (which must - exist) for the given object.

+
this_obj the object to initialize
Description
+
This function calls the zero-argument constructor (which must exist) for the given object.
@@ -696,7 +681,10 @@ mono_runtime_object_init (MonoObject *this_obj)
Syntax
-
mono_runtime_quit
+
void +mono_runtime_quit () + +

@@ -718,13 +706,8 @@ mono_runtime_run_main (MonoMethod *method, int argc, char* argv[],

Parameters
-
method the method to start the application with (usually Main)
argc number of arguments from the command line
argv array of strings from the command line
exc excetption results
Description
-

- Execute a standard Main() method (argc/argv contains the - executable name). This method also sets the command line argument value - needed by System.Environment. -

-

+
method the method to start the application with (usually Main)
argc number of arguments from the command line
argv array of strings from the command line
exc excetption results
Description
+
Execute a standard Main method (argc / argv contains the executable name). This method also sets the command line argument value needed by System.Environment.
@@ -738,10 +721,10 @@ mono_runtime_run_main (MonoMethod *method, int argc, char* argv[],
Syntax
-
mono_table_info_get_rows
+
int +mono_table_info_get_rows (const MonoTableInfo *table) + +

- - - diff --git a/docs/deploy/mono-api-utils.html b/docs/deploy/mono-api-utils.html index f1a2b2a46b..db1cfd205f 100644 --- a/docs/deploy/mono-api-utils.html +++ b/docs/deploy/mono-api-utils.html @@ -203,7 +203,10 @@

Syntax
-
mono_disasm_code
+
char* +mono_disasm_code (MonoDisHelper *dh, MonoMethod *method, const guchar *ip, const guchar* end) + +

@@ -218,7 +221,10 @@

Syntax
-
mono_disasm_code_one
+
char* +mono_disasm_code_one (MonoDisHelper *dh, MonoMethod *method, const guchar *ip, const guchar **endp) + +

@@ -236,7 +242,10 @@

Syntax
-
mono_stack_walk_no_il
+
void +mono_stack_walk_no_il (MonoStackWalk func, gpointer user_data) + +

@@ -251,13 +260,15 @@

Syntax
-
mono_stack_walk_async_safe
+
void +mono_stack_walk_async_safe (MonoStackWalkAsyncSafe func, void *initial_sig_context, void *user_data) + +

+

Description
+
Async safe version callable from signal handlers.

Others

- - - diff --git a/docs/deploy/mono-api-vm.html b/docs/deploy/mono-api-vm.html index 1814bfbb0e..ffdd3e56aa 100644 --- a/docs/deploy/mono-api-vm.html +++ b/docs/deploy/mono-api-vm.html @@ -187,6 +187,3 @@
-
- - diff --git a/docs/deploy/mono-api-wapi.html b/docs/deploy/mono-api-wapi.html index 072668d528..98a8b3d01c 100644 --- a/docs/deploy/mono-api-wapi.html +++ b/docs/deploy/mono-api-wapi.html @@ -2078,6 +2078,3 @@

- - - diff --git a/docs/exdoc b/docs/exdoc index 517956c3e6..92027663e6 100644 --- a/docs/exdoc +++ b/docs/exdoc @@ -1,91 +1,295 @@ #!/usr/bin/perl -if ($ARGV[0] eq "-h"){ - $sourcedir = $ARGV[1]; - $dir = $sourcedir; - $html = 1; - shift @ARGV; - shift @ARGV; -} -open (FILE, "$dir/api-style.css" || die "Did not find $dir/api-style.css"); -while (){ - $css = $css . $_; +use warnings; +use strict; + +use Getopt::Long; +use Pod::Usage; + +# Options +my $HELP = 0; +my $SOURCE_DIR = ''; +my $TARGET_DIR = ''; +my $WARNINGS = 0; + +GetOptions( + "help" => \$HELP, + "html|h=s" => \$SOURCE_DIR, + "target|t=s" => \$TARGET_DIR, + "warnings|W" => \$WARNINGS, +) or pod2usage(1); + +pod2usage(0) if $HELP; + +exdoc(); + +# +# Main entry point. +# +sub exdoc { + my %templates = (); + my %docs = (); + my $stylesheet = load_stylesheet($SOURCE_DIR); + load_templates($SOURCE_DIR, \%templates); + process_source_files(\%docs); + merge(\%docs, \%templates, \$stylesheet); } -if ($ARGV[0] eq "-t"){ - $dir = $ARGV[1]; - shift @ARGV; +# +# Load CSS stylesheet. +# +sub load_stylesheet { + my ($dir_path) = @_; + my $file_path = "$dir_path/api-style.css"; + open (my $file, '<', $file_path) or die "Could not open $file_path"; + local $/; + my $contents = <$file>; + close $file; + return $contents; } -if ($html){ - opendir (D, "$sourcedir/sources/") || die "Can not open $dir"; - while ($n = readdir (D)){ - if ($n =~ /mono-api-.*\.html$/){ - open (IN, "$sourcedir/sources/$n") || die "Can not open $n"; - $files[$filecount] = $n; - while (){ - @files_content[$filecount] .= $_; - if (/name="api:(.*?)"/){ - $_ =~ s/.*name="api:(\w+?)".*/\1/; - $apis[$filecount] .= "$_"; - } - } - $filecount++; - close IN; - } +# +# Load HTML templates. +# +sub load_templates { + my ($dir_path, $templates) = @_; + opendir (my $dir, "$dir_path/sources/") or die "Could not open $dir_path"; + while (my $file_name = readdir ($dir)) { + next if $file_name !~ /mono-api-.*\.html$/; + open (my $file, "$dir_path/sources/$file_name") or die "Could not open $file_name"; + my $contents = ''; + my @api = (); + while (<$file>) { + $contents .= $_; + if (/name="api:(.*?)"/) { + s/.*name="api:(\w+?)".*/$1/; + push @api, $_; + } + } + close $file; + $templates->{$file_name}->{contents} = $contents; + $templates->{$file_name}->{api} = \@api; + } + closedir $dir; +} + +# +# Extract documentation from all source files. +# +sub process_source_files { + my ($docs) = @_; + for my $file_path (@ARGV) { + process_source_file($file_path, $docs); } } -while (){ - if (/\/\*\* *\n/){ - &process_doc; - } else { - #print "IGNORING: $_"; - } +# +# Extract documentation from a single source file. +# +sub process_source_file { + my ($file_path, $docs) = @_; + open (my $file, '<', $file_path) or die "Could not open $file_path"; + while (<$file>) { + next if (!/\/\*\* *\n/); + process_function($file, $file_path, $docs); + } + close $file; } -if ($html){ - for ($f = 0; $f < $filecount; $f++){ - $name = $files[$f]; - open (OUT, "> $dir/html/$name") || die "Can not create $dir/html/$name"; - print "Merging: $name\n"; - print OUT<; + chomp; + s/^ \* //; + s/:$//; + $_ + }; + + # Ignore irrelevant functions, and those with the wrong doc format. + return if $name !~ /^mono_\w+$/; + + my $deprecated; + my @parameters = (); + my $body = ''; + my $returns = ''; + my $prototype = ''; + + while (<$file>) { + + # We've reached the last line in the documentation block. + if (/^ \*\*?\//) { + + # Grab function prototype. + while (<$file>) { + $prototype .= $_; + last if /\{/; + } + + # Clean up prototype. + $prototype = do { + $_ = $prototype; + # Strip braces and trailing whitespace. + s/{//; + s/ +$//; + # Turn "Type * xxx" into "Type* xxx" + s/^(\w+)\W+\*/$1*/; + $_; + }; + + # Process formatting within sections. + for my $parameter (@parameters) { + process_formatting(\$parameter->{description}, $file_path, $.); + } + process_formatting(\$returns, $file_path, $.); + process_formatting(\$body, $file_path, $.); + if (defined($deprecated)) { + process_formatting(\$deprecated, $file_path, $.); + } + $body =~ s/\n/ /g; + + if (exists($docs->{body}->{$name})) { + my $origin = $docs->{origin}->{$name}; + if ($WARNINGS) { + warn + "$file_path:$.: Redundant documentation for $name\n", + "$origin->{file}:$origin->{line}: Previously defined here\n"; + } + } + $docs->{origin}->{$name} = { file => $file_path, line => $. }; + $docs->{body}->{$name} = $body; + $docs->{parameters}->{$name} = \@parameters; + $docs->{deprecated}->{$name} = $deprecated if defined $deprecated; + $docs->{return}->{$name} = $returns; + $docs->{prototype}->{$name} = $prototype; + last; + + } + + # Strip newlines and asterisk prefix. + chomp; + s/^ +\*//; + + # Replace blank lines with paragraph breaks. + $_ = '

' if /^\s*$/; + + if ($section == $PARAMETER_SECTION) { + if (/\s*\\param +(\w+)(.*)/) { + # print "$file_path:$.: warning: Got parameter $1\n"; + push @parameters, { name => $1, description => $2 }; + } elsif (/\s*\\deprecated(.*)/) { + # print "$file_path:$.: warning: Got deprecated annotation\n"; + $deprecated = $1; + } elsif (/\s*(\w+):(.*)/) { + if ($1 eq 'deprecated') { + warn "$file_path:$.: Old-style monodoc notation 'deprecated:' used\n" + if $WARNINGS; + $deprecated = $2; + } else { + warn "$file_path:$.: Old-style monodoc notation 'param:' used\n" + if $WARNINGS; + push @parameters, { name => $1, description => $2 }; + } + } else { + # $body = "\t$_\n"; + $section = $BODY_SECTION; + redo; + } + } elsif ($section == $BODY_SECTION) { + if (s/(Returns?:\s*|\\returns?\s*)//) { + $returns = "\t$_\n"; + $section = $RETURN_SECTION; + } else { + $body .= "\n\t$_"; + } + } elsif ($section == $RETURN_SECTION) { + $returns .= "\n\t$_"; + } else { + die "Invalid section $section\n"; + } + } +} + +# +# Substitute formatting within documentation text. +# +sub process_formatting { + my ($content, $file_path, $current_line) = @_; + $_ = $$content; + + # Constants + s{NULL}{NULL}g; + s{TRUE}{TRUE}g; + s{FALSE}{FALSE}g; + + # Parameters + warn "$file_path:$current_line: Old-style monodoc notation '\@param' used\n" + if s{@(\w+)}{$1}g && $WARNINGS; + s{\\p +(\w+)}{$1}g; + + # Code + warn "$file_path:$current_line: Old-style monodoc notation '#code' used\n" + if s{#(\w+)}{$1}g && $WARNINGS; + warn "$file_path:$current_line: Old-style monodoc notation '`code`' used\n" + if s{\`((?!api:)[:.\w\*]+)\`}{$1}g && $WARNINGS; + s{\\c +(\S+(?$1}g; + + $$content = $_; +} + +# +# Merge templates with stylesheet and documentation extracted from sources. +# +sub merge { + my ($docs, $templates, $stylesheet) = @_; + my $last = ''; + for my $name (keys %$templates) { + open (my $output_file, '>', "$TARGET_DIR/html/$name") + or die "Could not create $TARGET_DIR/html/$name"; + print "Merging: $name\n"; + print $output_file < $name

EOF - @a = split (/\n/, $files_content[$f]); - $strikeextra = ""; - $api_shown = 0; - for ($ai = 0; $ai < $#a; $ai++){ - $line = $a[$ai]; - - ($api,$caption) = $line =~ /

(\w+)<\/a><\/h4>/; - if ($api ne ""){ - if ($api_shown == 1){ - print OUT "

\n\n"; - if ($deprecated{$api}){ - $strike = "mapi-strike"; - $strikeextra = "
Deprecated: " . $deprecated{$api}; - } else { - $strike = ""; - $strikeextra = ""; - } - } - $api_shown = 1; - $proto = $prototype{$api}; - if ($proto eq ""){ - $proto = "$api"; - } + my @a = split (/\n/, $templates->{$name}->{contents}); + my $strike = ''; + my $strikeextra = ''; + my $api_shown = 0; + for (my $ai = 0; $ai < $#a; $ai++) { + my $line = $a[$ai]; + if (my ($api, $caption) = ($line =~ /

(\w+)<\/a><\/h4>/)) { + if ($api_shown == 1) { + print $output_file "

\n\n"; + if ($docs->{deprecated}->{$api}) { + $strike = "mapi-strike"; + $strikeextra = "
Deprecated: " . $docs->{deprecated}->{$api}; + } else { + $strike = ""; + $strikeextra = ""; + } + } + $api_shown = 1; + my $proto = $docs->{prototype}->{$api} // $api; - print OUT<
$api$strikeextra
@@ -98,228 +302,201 @@ EOF
$proto

EOF - $ppars = $arguments{$api}; - if ($ppars ne "" && (!($ppars =~ /^[ \t]+$/))){ - print OUT "

Parameters
\n"; - print OUT " ".${arguments{$api}}."
"; - } - - &opt_print ("Return value", $returns{$api}, 0); - &opt_print ("Description", $bodies{$api}, 0); - print OUT "
\n
\n"; - } else { - if ($line =~ /@API_IDX@/){ - $apis_toc = &create_toc ($apis[$f]); - $line =~ s/\@API_IDX\@/$apis_toc/; - } - if ($line =~ /^

\n"; - $api_shown = 0; - } - if ($line =~ /`/){ - } - print OUT "$line\n"; - } - } - print OUT< - - -EOF - close OUT; - system ("$ENV{runtimedir}/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name"); + if (exists ($docs->{parameters}->{$api})) { + my $ppars = $docs->{parameters}->{$api}; + if (@$ppars) { + print $output_file + "
Parameters
\n", + " ", + render_parameters($ppars), + "
"; + } + } + opt_print ($output_file, "Return value", $docs->{return}->{$api}); + opt_print ($output_file, "Description", $docs->{body}->{$api}); + print $output_file " \n \n"; + } else { + if ($line =~ /\@API_IDX\@/) { + my $apis_toc = create_toc ($docs, $templates->{$name}->{api}); + $line =~ s/\@API_IDX\@/$apis_toc/; + } + if ($line =~ /^

\n"; + $api_shown = 0; + } + if ($line =~ /`/) { + } + print $output_file "$line\n"; + } + } + print $output_file + " ", + "", + ""; + close $output_file; + system ("$ENV{runtimedir}/mono-wrapper convert.exe $TARGET_DIR/html/$name $TARGET_DIR/html/x-$name"); - # clean up the mess that AgilityPack does, it CDATAs our CSS - open HACK, "$dir/html/x-$name" || die "Could not open $dir/html/x-$name"; - open HACKOUT, ">$dir/deploy/$name" || die "Could not open output"; + # Clean up the mess that AgilityPack makes (it CDATAs our CSS). + open (my $hack_input, '<', "$TARGET_DIR/html/x-$name") + or die "Could not open $TARGET_DIR/html/x-$name"; + open (my $hack_output, '>', "$TARGET_DIR/deploy/$name") + or die "Could not open output"; - $line = 0; - $doprint = 0; - while (){ - print HACKOUT $last if ($doprint); - $line++; - s/^\/\/\/\///; + my $line = 0; + my $doprint = 0; + while (<$hack_input>) { + print $hack_output $last if ($doprint); + $line++; + s/^\/\/\/\///; - # Remove the junk wrapper generated by AgilityPack - if ($line==1){ - s///; - } - if (/ + + + +

+ Assemblies Run +

+ +

+ Summary +

+
+ Tests run: — + + Errors: , + + + Failures: , + + + Skipped: , + + Run time: s, + Finished: +
+ +
+

+ Errors +

+ + + +
+

+ Failed tests +

+ + + + + +
+

+ Collection failures +

+ + + + + +
+

+ Skipped tests +

+ + + + +
+

+ All tests +

+
Click test class name to expand/collapse test details
+ + + +

+ + s + + + ToggleClass('class') + ToggleClass('class') + + ✘ + + + ✔ + +   +   + ( tests) + + +
+

+
+ + display: none; + + class + + + +
+ + + + + + +
+ +
+ + + +
+ altrow + + + s + + + + Skipped + ❢ + + + ✘ + + + ✔ + +   +
+ +
+ + +
+ + +
Output:
+
+ + +
Traits:
+ + +
+ +
+ + + + + + + + + + +

+ +
+ altrow + ✘
+ +
+ + +
+ +
+ + + + + +
+ + altrow + + ✘ + Test Assembly Cleanup + Test Collection Cleanup + Test Class Cleanup + Test Method Cleanup + Test Case Cleanup + Test Cleanup + Fatal Error + + () + +
+ +
+ + +
+ +
+ + + + \ No newline at end of file diff --git a/external/xunit-binaries/NUnitXml.xslt b/external/xunit-binaries/NUnitXml.xslt new file mode 100644 index 0000000000..734af5422d --- /dev/null +++ b/external/xunit-binaries/NUnitXml.xslt @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + True + + + Failure + Success + + + + + + + + + + + + + + + + + + Failure + Success + + + False + True + + + + + + + + + + + + + + + + + Failure + Success + + + False + True + + + + + + + + + + + + + + + + + + + + + + + + + False + True + + + Failure + Success + Skipped + + + + False + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/xunit-binaries/README.md b/external/xunit-binaries/README.md new file mode 100644 index 0000000000..d18c5ec9bb --- /dev/null +++ b/external/xunit-binaries/README.md @@ -0,0 +1,3 @@ +# xunit-binaries + +Extracted Xunit nuget packages diff --git a/external/xunit-binaries/xUnit1.xslt b/external/xunit-binaries/xUnit1.xslt new file mode 100644 index 0000000000..bb77bc2bba --- /dev/null +++ b/external/xunit-binaries/xUnit1.xslt @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/xunit-binaries/xunit.console.exe.config b/external/xunit-binaries/xunit.console.exe.config new file mode 100644 index 0000000000..d5d8e87fc6 --- /dev/null +++ b/external/xunit-binaries/xunit.console.exe.config @@ -0,0 +1,18 @@ + + + +
+ + + + + + + + + + + + + + diff --git a/libgc/blacklst.c b/libgc/blacklst.c index ae2f95cb3f..5e6ebcfb7a 100644 --- a/libgc/blacklst.c +++ b/libgc/blacklst.c @@ -21,7 +21,7 @@ * See the definition of page_hash_table in gc_private.h. * False hits from the stack(s) are much more dangerous than false hits * from elsewhere, since the former can pin a large object that spans the - * block, eventhough it does not start on the dangerous block. + * block, even though it does not start on the dangerous block. */ /* diff --git a/libgc/doc/README.changes.REMOVED.git-id b/libgc/doc/README.changes.REMOVED.git-id index 8c961ee123..bbf8ea4f1f 100644 --- a/libgc/doc/README.changes.REMOVED.git-id +++ b/libgc/doc/README.changes.REMOVED.git-id @@ -1 +1 @@ -fa6f279f518a5fac4b4778e9e869e4d82bb0539c \ No newline at end of file +c30d2fc2184751a5b49d4b1c65c76655d8af6006 \ No newline at end of file diff --git a/libgc/doc/README.macros b/libgc/doc/README.macros index df0ef2cda9..153a3e0f91 100644 --- a/libgc/doc/README.macros +++ b/libgc/doc/README.macros @@ -19,7 +19,7 @@ relatively easy to adapt to new compilers with a different set of predefined macros. Currently these macros generally identify platforms instead of features. In many cases, this is a mistake. -3) The code currently avoids #elif, eventhough that would make it more +3) The code currently avoids #elif, even though that would make it more readable. This was done since #elif would need to be understood by ALL compilers used to build the collector, and that hasn't always been the case. It makes sense to reconsider this decision at some point, since #elif has been diff --git a/libgc/mark.c b/libgc/mark.c index e14e5296c5..e870342e41 100644 --- a/libgc/mark.c +++ b/libgc/mark.c @@ -936,7 +936,7 @@ void GC_do_local_mark(mse *local_mark_stack, mse *local_top) /* Try to share the load, since the main stack is empty, */ /* and helper threads are waiting for a refill. */ /* The entries near the bottom of the stack are likely */ - /* to require more work. Thus we return those, eventhough */ + /* to require more work. Thus we return those, even though */ /* it's harder. */ mse * p; mse * new_bottom = local_mark_stack diff --git a/man/mdoc.5 b/man/mdoc.5 index 440fc15a39..3cd4bbea55 100644 --- a/man/mdoc.5 +++ b/man/mdoc.5 @@ -765,7 +765,7 @@ Refers to a namespace, e.g. \fIN:System\fR. .I "P:" Refers to a property. If the property is an indexer or takes parameters, the parameter types are appended to the property name and enclosed with -paranthesis: +parenthesis: \fIP:System.String.Length\fR, \fIP:System.String.Chars(System.Int32)\fR. .TP diff --git a/man/mono.1 b/man/mono.1 index f5e87a32bb..b23581535c 100644 --- a/man/mono.1 +++ b/man/mono.1 @@ -19,14 +19,6 @@ mono \- Mono's ECMA-CLI native code generator (Just-in-Time and Ahead-of-Time) \fImono\fP is a runtime implementation of the ECMA Common Language Infrastructure. This can be used to run ECMA and .NET applications. .PP -The runtime contains a native code generator that transforms the -Common Intermediate Language into native code. -.PP -The code generator can operate in two modes: just in time compilation -(JIT) or ahead of time compilation (AOT). Since code can be -dynamically loaded, the runtime environment and the JIT are always -present, even if code is compiled ahead of time. -.PP The runtime loads the specified .I file and optionally passes @@ -36,12 +28,26 @@ to it. The .I file is an ECMA assembly. They typically have a .exe or .dll extension. .PP +These executables can reference additionaly functionality in the form +of assembly references. By default those assembly references are +resolved as follows: the \fBmscorlib.dll\fR is resolved from the +system profile that is configured by Mono, and other assemblies are +loaded from the Global Assembly Cache (GAC). +.PP +The runtime contains a native code generator that transforms the +Common Intermediate Language into native code. +.PP +The code generator can operate in two modes: just in time compilation +(JIT) or ahead of time compilation (AOT). Since code can be +dynamically loaded, the runtime environment and the JIT are always +present, even if code is compiled ahead of time. +.PP The runtime provides a number of configuration options for running applications, for developing and debugging, and for testing and debugging the runtime itself. .PP -The \fImono\fP command uses the Boehm conservative garbage collector -while the \fImono-sgen\fP command uses a moving and generational +The \fImono\fP command uses the moving and generational SGen garbage collector +while the \fImono-boehm\fP command uses the conservative Boehm garbage collector. .SH PORTABILITY On Unix-based systems, Mono provides a mechanism to emulate the @@ -87,7 +93,7 @@ information which is not available on the generated file. When precompiling code, you might want to compile with all optimizations (-O=all). Pre-compiled code is position independent code. .Sp -Pre compilation is just a mechanism to reduce startup time, increase +Precompilation is just a mechanism to reduce startup time, increase code sharing across multiple mono processes and avoid just-in-time compilation program startup costs. The original assembly must still be present, as the metadata is contained there. @@ -305,6 +311,26 @@ Instructs the AOT compiler to emit (or not emit) debug symbol information. For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/ .RE .TP +\fB--aot-path=PATH\fR +List of additional directories to search for AOT images. +.TP +\fB--apply-bindings=FILE\fR +Apply the assembly bindings from the specified configuration file when running +the AOT compiler. This is useful when compiling an auxiliary assembly that is +referenced by a main assembly that provides a configuration file. For example, +if app.exe uses lib.dll then in order to make the assembly bindings from +app.exe.config available when compiling lib.dll ahead of time, use: +.nf + mono --apply-bindings=app.exe.config --aot lib.dll +.fi +.TP +\fB--assembly-loader=MODE\fR +If mode is \fBstrict\fR, Mono will check that the public key token, culture and version +of a candidate assembly matches the requested strong name. If mode is \fBlegacy\fR, as +long as the name matches, the candidate will be allowed. \fBstrict\fR is the behavior +consistent with .NET Framework but may break some existing mono-based applications. +The default is \fBlegacy\fR. +.TP \fB--attach=[options]\fR Currently the only option supported by this command line argument is \fBdisable\fR which disables the attach functionality. @@ -315,15 +341,12 @@ The default files are /etc/mono/config and ~/.mono/config or the file specified in the MONO_CONFIG environment variable, if set. See the mono-config(5) man page for details on the format of this file. .TP -\fB--aot-path=PATH\fR -List of additional directories to search for AOT images. -.TP \fB--debugger-agent=[options]\fR This instructs the Mono runtime to start a debugging agent inside the Mono runtime and connect it to a client user interface will control the Mono process. -This option is typically used by IDEs, like the MonoDevelop IDE. -.PP +This option is typically used by IDEs, like the MonoDevelop or Visual Studio IDEs. +.RS The configuration is specified using one of more of the following options: .RS .ne 8 @@ -350,10 +373,10 @@ actively waits for the debugger front end to connect to the Mono process. Mono will print out to stdout the IP address and port where it is listening. .TP .I setpgid=[y/n] -If set to yes, Mono will call \fBsetpgid(0, 0)\fB on startup, if that function +If set to yes, Mono will call \fBsetpgid(0, 0)\fR on startup, if that function is available on the system. This is useful for ensuring that signals delivered to a process that is executing the debuggee are not propagated to the debuggee, -e.g. when Ctrl-C sends \fBSIGINT\fB to the \fBsdb\fB tool. +e.g. when Ctrl-C sends \fBSIGINT\fR to the \fBsdb\fR tool. .TP .I suspend=[y/n] Defaults to yes, with the default option Mono will suspend the vm on startup @@ -596,7 +619,7 @@ platforms, and only when using gdb 7.0 or later. Turns on profiling. For more information about profiling applications and code coverage see the sections "PROFILING" and "CODE COVERAGE" below. -.TP +.Sp This option can be used multiple times, each time will load an additional profiler. This allows developers to use modules that extend the JIT through the Mono profiling interface. @@ -677,7 +700,7 @@ Finally, namespaces can be specified using the N: prefix: Don't align stack frames on the x86 architecture. By default, Mono aligns stack frames to 16 bytes on x86, so that local floating point and SIMD variables can be properly aligned. This option turns off the -alignment, which usually saves one intruction per call, but might +alignment, which usually saves one instruction per call, but might result in significantly lower floating point and SIMD performance. .TP \fB--jitmap\fR @@ -1760,7 +1783,7 @@ Captures the interrupt signal (Control-C) and displays a stack trace when pressed. Useful to find out where the program is executing at a given point. This only displays the stack trace of a single thread. .TP -\fBinit-stacks\FR +\fBinit-stacks\fR Instructs the runtime to initialize the stack with some known values (0x2a on x86-64) at the start of a method to assist in debuggin the JIT engine. @@ -1800,11 +1823,14 @@ values. This option allows using single-steps and breakpoints in hardware where we cannot do it with signals. .TP -\fBsuspend-on-sigsegv\fR -This option will suspend the program when a native SIGSEGV is received. +\fBsuspend-on-native-crash\fR +This option will suspend the program when a native crash occurs (SIGSEGV, SIGILL, ...). This is useful for debugging crashes which do not happen under gdb, since a live process contains more information than a core file. .TP +\fBsuspend-on-sigsegv\fR +Same as \fBsuspend-on-native-crash\fR. +.TP \fBsuspend-on-exception\fR This option will suspend the program when an exception occurs. .TP @@ -2007,8 +2033,8 @@ http://www.mono-project.com/community/help/mailing-lists/ http://www.mono-project.com .SH SEE ALSO .PP -certmgr(1), csharp(1), mcs(1), mdb(1), monocov(1), monodis(1), -mono-config(5), mozroots(1), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8). +certmgr(1), cert-sync(1), csharp(1), gacutil(1), mcs(1), mdb(1), monocov(1), monodis(1), +mono-config(5), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8). .PP For more information on AOT: http://www.mono-project.com/docs/advanced/aot/ diff --git a/man/monodocer.1 b/man/monodocer.1 index 19d7403052..8bbc34cb23 100644 --- a/man/monodocer.1 +++ b/man/monodocer.1 @@ -237,7 +237,7 @@ to the type name, while methods append the method name (with an optional count of the number of generic parameters). .Sp If the constructor or method take arguments, these are listed within -paranthesis after the constructor/method name: +parenthesis after the constructor/method name: .Sp .I M:System.Object..ctor , @@ -259,7 +259,7 @@ Refers to a namespace, e.g. .I "P:" Refers to a property. If the property is an indexer or takes parameters, the parameter types are appended to the property name and enclosed with -paranthesis: +parenthesis: .I P:System.String.Length , .I P:System.String.Chars(System.Int32) diff --git a/man/sqlsharp.1 b/man/sqlsharp.1 index 4bf500ffd4..008fddbfc5 100644 --- a/man/sqlsharp.1 +++ b/man/sqlsharp.1 @@ -407,7 +407,7 @@ mysql MySQL AB MySql.Data.MySqlClient MySql.Data NOTES: Ngsql is the .Net Data Provider for PosgreSQL. The -latest verison can be downloaded from +latest version can be downloaded from http://npgsql.projects.postgresql.org/ MySql.Data is the MySQL Connector/Net for connecting to MySql databases. diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 89d281207c..d260406b13 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,11 +34,11 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.0.1.1"; + public const string MonoVersion = "5.2.0.175"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; - public const int MonoCorlibVersion = 1050001000; + public const int MonoCorlibVersion = 1050200001; #if MOBILE // Versions of .NET Framework for Silverlight 4.0 diff --git a/mcs/build/library.make b/mcs/build/library.make index c836957962..b2870bf58c 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -134,7 +134,7 @@ csproj-local: csproj-library csproj-test intermediate_clean=$(subst /,-,$(intermediate)) csproj-library: config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \ - case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; esac; \ + case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; *"legacy"*) config_file=legacy_$$config_file;; esac; \ echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \ (echo $(is_boot); \ echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \ @@ -266,7 +266,7 @@ endif # make dist will collect files in .sources files from all profiles dist-local: dist-default subs=' ' ; \ - for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \ + for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *_xtest.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \ case $$f in \ ../*) : ;; \ *.g.cs) : ;; \ @@ -377,3 +377,12 @@ $(the_libdir)/.doc-stamp: $(the_lib) # Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS gen-deps: @echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE) + +# Should be $(BUILD_TOOLS_PROFILE) but still missing System.Windows.Forms +resx2sr=$(topdir)/class/lib/net_4_x/resx2sr.exe + +update-corefx-sr: $(resx2sr) $(RESX_RESOURCE_STRING) + MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(resx2sr) $(RESX_RESOURCE_STRING) >corefx/SR.cs + +$(resx2sr): + $(MAKE) -C $(topdir)/tools/resx2sr diff --git a/mcs/build/profiles/net_4_x.make b/mcs/build/profiles/net_4_x.make index b5350c6918..a63c7a29e9 100644 --- a/mcs/build/profiles/net_4_x.make +++ b/mcs/build/profiles/net_4_x.make @@ -11,7 +11,7 @@ profile-check: @: DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) FRAMEWORK_VERSION = 4.5 XBUILD_VERSION = 4.0 diff --git a/mcs/build/rules.make b/mcs/build/rules.make index 2ee6460b94..2ddd55efb2 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -49,9 +49,7 @@ INTERNAL_CSC_LOCATION = $(CSC_LOCATION) # Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION) -RESGEN_EXE = $(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)resgen.exe -INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) -RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) +RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe depsdir = $(topdir)/build/deps diff --git a/mcs/build/tests.make b/mcs/build/tests.make index d9f6a95ff7..45c77ebda4 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -20,8 +20,18 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin ifndef NO_TEST test_nunit_lib = nunitlite.dll +xunit_core := xunit.core xunit.abstractions xunit.assert +xunit_deps := System.Runtime +xunit_class_deps := Xunit.NetCore.Extensions + +xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core)) +xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps)) + +xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll) +xunit_libs_ref += $(xunit_libs_dep:%=-r:%) TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS)) +XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS)) test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%) test_nunit_ref = $(test_nunit_dep:%=-r:%) @@ -34,6 +44,7 @@ test_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll.sources) endif test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll) + test_sourcefile_excludes = $(test_lib).exclude.sources test_pdb = $(test_lib:.dll=.pdb) @@ -42,12 +53,26 @@ test_makefrag = $(depsdir)/$(test_lib).makefrag test_flags = -r:$(the_assembly) $(test_nunit_ref) $(TEST_MCS_FLAGS) $(TEST_LIB_MCS_FLAGS) tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag) +xtest_sourcefile = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources) + +ifeq ($(wildcard $(xtest_sourcefile)),) +xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources) +endif + +xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll) + +xtest_response = $(depsdir)/$(xtest_lib).response +xtest_makefrag = $(depsdir)/$(xtest_lib).makefrag +xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS) + ifndef HAVE_CS_TESTS HAVE_CS_TESTS := $(wildcard $(test_sourcefile)) endif HAVE_SOURCE_EXCLUDES := $(wildcard $(test_sourcefile_excludes)) +HAVE_CS_XTESTS := $(wildcard $(xtest_sourcefile)) + endif # !NO_TEST ifndef NO_TEST @@ -61,6 +86,10 @@ endif echo "stamp" >$@ tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp + +$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)Xunit.NetCore.Extensions.dll: + $(MAKE) -C $(topdir)/class/Xunit.NetCore.Extensions + endif test_assemblies := @@ -157,6 +186,57 @@ $(test_makefrag): $(test_response) -include $(test_makefrag) +build-test-lib: $(test_lib) + @echo Building testing lib + endif + +ifdef HAVE_CS_XTESTS + +XTEST_HARNESS_PATH = $(topdir)/../external/xunit-binaries +XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe +XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml +XTEST_TRAIT := -notrait category=failing -notrait category=nonnetcoreapptests -notrait Benchmark=true -notrait category=outerloop + +ifdef FIXTURE +XTEST_HARNESS_FLAGS += -class $(FIXTURE) +endif + +ifdef TESTNAME +XTEST_HARNESS_FLAGS += -method $(TESTNAME) +endif + +check: run-xunit-test-local +run-xunit-test: run-xunit-test-local +xunit-test-local: $(xunit_test_lib) +run-xunit-test-local: run-xunit-test-lib + +# ln -s is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only +run-xunit-test-lib: xunit-test-local + @ln -fs $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll + ok=:; \ + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \ + $$ok + @rm -f xunit.execution.desktop.dll + +$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) + $(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) + +xtest_response_preprocessed = $(xtest_response)_preprocessed + +# This handles .excludes/.sources pairs, as well as resolving the +# includes that occur in .sources files +$(xtest_response): $(xtest_sourcefile) + $(SHELL) $(topdir)/build/gensources.sh $@ '$(xtest_sourcefile)' '$(xtest_sourcefile_excludes)' + +$(xtest_makefrag): $(xtest_response) + @echo Creating $@ ... + @sed 's,^,$(xunit_test_lib): ,' $< >$@ + +-include $(xtest_makefrag) + +endif + + .PHONY: patch-nunitlite-appconfig diff --git a/mcs/class/Facades/Makefile b/mcs/class/Facades/Makefile index d16c77cfa0..4de8b1f6b7 100644 --- a/mcs/class/Facades/Makefile +++ b/mcs/class/Facades/Makefile @@ -37,8 +37,8 @@ doc-update-local: doc-update-recursive: @echo "do not recurse the Facades folder" -System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Runtime.Serialization System.XML \ -System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem \ +System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.XML \ +System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \ System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression \ System.Web.Services: diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/AssemblyInfo.cs b/mcs/class/Facades/Microsoft.Win32.Registry/AssemblyInfo.cs index 4b723eac1a..6b25c0b4d3 100644 --- a/mcs/class/Facades/Microsoft.Win32.Registry/AssemblyInfo.cs +++ b/mcs/class/Facades/Microsoft.Win32.Registry/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.1.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/TypeForwarders.cs b/mcs/class/Facades/Microsoft.Win32.Registry/TypeForwarders.cs index fae8514159..77ccf63681 100644 --- a/mcs/class/Facades/Microsoft.Win32.Registry/TypeForwarders.cs +++ b/mcs/class/Facades/Microsoft.Win32.Registry/TypeForwarders.cs @@ -23,11 +23,15 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.Registry))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryHive))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryKey))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryKeyPermissionCheck))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryOptions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryValueKind))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryValueOptions))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryOptions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.RegistryView))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.Win32.SafeHandles.SafeRegistryHandle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.AccessControl.RegistryAccessRule))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.AccessControl.RegistryAuditRule))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.AccessControl.RegistryRights))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.AccessControl.RegistrySecurity))] diff --git a/mcs/class/Facades/System.Collections.NonGeneric/AssemblyInfo.cs b/mcs/class/Facades/System.Collections.NonGeneric/AssemblyInfo.cs index dc7beb6e66..fef6ff714f 100644 --- a/mcs/class/Facades/System.Collections.NonGeneric/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Collections.NonGeneric/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/AssemblyInfo.cs b/mcs/class/Facades/System.ComponentModel.Annotations/AssemblyInfo.cs index 932bd697e1..4d823adf36 100644 --- a/mcs/class/Facades/System.ComponentModel.Annotations/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ComponentModel.Annotations/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Data.Common/AssemblyInfo.cs b/mcs/class/Facades/System.Data.Common/AssemblyInfo.cs index 452d0c245f..07a4d102d1 100644 --- a/mcs/class/Facades/System.Data.Common/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Data.Common/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Data.Common/Makefile b/mcs/class/Facades/System.Data.Common/Makefile index fe63a8e0f7..ff6d035678 100644 --- a/mcs/class/Facades/System.Data.Common/Makefile +++ b/mcs/class/Facades/System.Data.Common/Makefile @@ -14,6 +14,8 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.Data System.Xml LIB_MCS_FLAGS = $(SIGN_FLAGS) +PLATFORM_DEBUG_FLAGS = + NO_TEST = yes include $(MCS_BUILD_DIR)/library.make diff --git a/mcs/class/Facades/System.Data.Common/System.Data.Common.dll.sources b/mcs/class/Facades/System.Data.Common/System.Data.Common.dll.sources index 883b2970ba..719628dc7c 100644 --- a/mcs/class/Facades/System.Data.Common/System.Data.Common.dll.sources +++ b/mcs/class/Facades/System.Data.Common/System.Data.Common.dll.sources @@ -1,6 +1,2 @@ TypeForwarders.cs AssemblyInfo.cs - -../../../../external/corefx/src/System.Data.Common/src/System/Data/IColumnMappingCollection.cs -../../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbColumn.cs -../../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReaderExtensions.Facade.cs diff --git a/mcs/class/Facades/System.Data.Common/TypeForwarders.cs b/mcs/class/Facades/System.Data.Common/TypeForwarders.cs index 9470c9c78b..feba11981f 100644 --- a/mcs/class/Facades/System.Data.Common/TypeForwarders.cs +++ b/mcs/class/Facades/System.Data.Common/TypeForwarders.cs @@ -21,35 +21,159 @@ // [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DBNull))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.AcceptRejectRule))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandBehavior))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.CatalogLocation))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataAdapter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMappingCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMappingCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbColumn))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommand))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommandBuilder))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnectionStringBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataAdapter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReaderExtensions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataRecord))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataSourceEnumerator))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbEnumerator))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataCollectionNames))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataColumnNames))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameterCollection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderFactory))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderSpecificTypePropertyAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbTransaction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.GroupByBehavior))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IDbColumnSchemaGenerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IdentifierCase))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatedEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatingEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableColumn))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableOptionalColumn))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SupportedJoinOperators))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConflictOption))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConnectionState))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Constraint))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DBConcurrencyException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumn))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelation))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelationCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRow))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowAction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowState))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowVersion))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowView))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSet))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSetDateTime))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSysDescriptionAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataView))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewManager))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewRowState))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSetting))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSettingCollection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DbType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DeletedRowInaccessibleException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DuplicateNameException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.EvaluateException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ForeignKeyConstraint))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMappingCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataAdapter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameterCollection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataReader))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataRecord))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbCommand))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbConnection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataAdapter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataParameter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbTransaction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMapping))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMappingCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InRowChangingEventException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InternalDataCollectionBase))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidConstraintException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidExpressionException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IsolationLevel))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.KeyRestrictionBehavior))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.LoadOption))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MappingType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingMappingAction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingPrimaryKeyException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingSchemaAction))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.NoNullAllowedException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ParameterDirection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.PropertyCollection))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ReadOnlyException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.RowNotInTableException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Rule))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaSerializationMode))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SerializationFormat))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlDbType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.INullable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlAlreadyFilledException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBinary))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBoolean))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlByte))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBytes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlChars))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlCompareOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDateTime))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDecimal))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDouble))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlGuid))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt16))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt32))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt64))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlMoney))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNotFilledException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNullValueException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlSingle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlString))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTruncateException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTypeException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlXml))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.StorageState))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventArgs))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StrongTypingException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SyntaxErrorException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UniqueConstraint))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateRowSource))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateStatus))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.VersionNotFoundException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlReadMode))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlWriteMode))] diff --git a/mcs/class/Facades/System.Data.SqlClient/AssemblyInfo.cs b/mcs/class/Facades/System.Data.SqlClient/AssemblyInfo.cs index b9f48ff126..3506b35315 100644 --- a/mcs/class/Facades/System.Data.SqlClient/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Data.SqlClient/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs b/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs index 3237d9eb98..d8f7bb5be5 100644 --- a/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs +++ b/mcs/class/Facades/System.Data.SqlClient/TypeForwarders.cs @@ -22,6 +22,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.SqlServer.Server.SqlDataRecord))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Microsoft.SqlServer.Server.SqlMetaData))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.OperationAbortedException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.ApplicationIntent))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SortOrder))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlBulkCopy))] @@ -32,6 +33,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlCommand))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlConnection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlConnectionStringBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlDataAdapter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlDataReader))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlError))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlErrorCollection))] @@ -42,6 +44,10 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlParameterCollection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowsCopiedEventArgs))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowsCopiedEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowUpdatedEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowUpdatedEventHandler))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowUpdatingEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlRowUpdatingEventHandler))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlClient.SqlTransaction))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlDbType))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.INullable))] @@ -68,4 +74,3 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventArgs))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventHandler))] - diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/AssemblyInfo.cs b/mcs/class/Facades/System.Diagnostics.StackTrace/AssemblyInfo.cs index fa5b9f81d5..23257c2486 100644 --- a/mcs/class/Facades/System.Diagnostics.StackTrace/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Diagnostics.StackTrace/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.1.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/TypeForwarders.cs b/mcs/class/Facades/System.Diagnostics.StackTrace/TypeForwarders.cs index 3643429a21..b68327ecf2 100644 --- a/mcs/class/Facades/System.Diagnostics.StackTrace/TypeForwarders.cs +++ b/mcs/class/Facades/System.Diagnostics.StackTrace/TypeForwarders.cs @@ -22,4 +22,19 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackFrame))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackTrace))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder1))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocument))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocumentWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolMethod))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolNamespace))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolReader))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolScope))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolVariable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymAddressKind))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymDocumentType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageType))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageVendor))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymbolToken))] diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/AssemblyInfo.cs b/mcs/class/Facades/System.Diagnostics.Tracing/AssemblyInfo.cs index a6d882dd4f..8cecf7a0b4 100644 --- a/mcs/class/Facades/System.Diagnostics.Tracing/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Diagnostics.Tracing/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Makefile b/mcs/class/Facades/System.Diagnostics.Tracing/Makefile index d74812c5e9..14b380da86 100644 --- a/mcs/class/Facades/System.Diagnostics.Tracing/Makefile +++ b/mcs/class/Facades/System.Diagnostics.Tracing/Makefile @@ -13,6 +13,8 @@ KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_MCS_FLAGS = $(SIGN_FLAGS) +PLATFORM_DEBUG_FLAGS = + NO_TEST = yes include $(MCS_BUILD_DIR)/library.make diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs b/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs index 2e4028199f..fb688bfe39 100644 --- a/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs +++ b/mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs @@ -25,6 +25,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventChannel))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommand))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommandEventArgs))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCounter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventDataAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventFieldAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventFieldFormat))] @@ -44,7 +45,3 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventTask))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.NonEventAttribute))] - -#if NETSTANDARD -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCounter))] -#endif diff --git a/mcs/class/Facades/System.Drawing.Primitives/Makefile b/mcs/class/Facades/System.Drawing.Primitives/Makefile index a42f4bc608..1295d05c32 100644 --- a/mcs/class/Facades/System.Drawing.Primitives/Makefile +++ b/mcs/class/Facades/System.Drawing.Primitives/Makefile @@ -14,10 +14,27 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) -ifneq (2.1, $(FRAMEWORK_VERSION)) -ifndef XAMMAC_4_5 +# xammac_net_4_5 and the testing_* profiles are special, they don't build +# System.Drawing.dll or equivalent neither in Mono nor in the XM repo. +# For now we embed the types directly here. +# TODO: find a better solution. +EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE)) + +ifndef EMBEDDED_DRAWING_DEP + +# profiles which build a System.Drawing.dll in the repo +REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE)) + +ifdef REPO_DRAWING_DEP LIB_REFS += System.Drawing +else +# When System.Drawing.dll is not built in the Mono repo but in +# the product repo like in the XI/XA case we need to pass in a reference +# to the assembly containing drawing types like Rectangle etc. from there. +# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE. +LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE) endif + endif PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources index dd5e421011..e437af86a0 100644 --- a/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources +++ b/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources @@ -6,3 +6,7 @@ AssemblyInfo.cs ../../System.Drawing/System.Drawing/RectangleF.cs ../../System.Drawing/System.Drawing/Size.cs ../../System.Drawing/System.Drawing/SizeF.cs + +../../System.Drawing/System.Drawing/Color.cs +../../System.Drawing/System.Drawing/KnownColor.cs +../../System.Drawing/System.Drawing/KnownColors.cs diff --git a/mcs/class/Facades/System.Drawing.Primitives/testing_aot_full_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/testing_aot_full_System.Drawing.Primitives.dll.sources new file mode 100644 index 0000000000..49902e8e3a --- /dev/null +++ b/mcs/class/Facades/System.Drawing.Primitives/testing_aot_full_System.Drawing.Primitives.dll.sources @@ -0,0 +1 @@ +#include embedded_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/testing_aot_hybrid_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/testing_aot_hybrid_System.Drawing.Primitives.dll.sources new file mode 100644 index 0000000000..49902e8e3a --- /dev/null +++ b/mcs/class/Facades/System.Drawing.Primitives/testing_aot_hybrid_System.Drawing.Primitives.dll.sources @@ -0,0 +1 @@ +#include embedded_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Globalization.Extensions/AssemblyInfo.cs b/mcs/class/Facades/System.Globalization.Extensions/AssemblyInfo.cs index ab67b29b11..c58e46ad97 100644 --- a/mcs/class/Facades/System.Globalization.Extensions/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Globalization.Extensions/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.1.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/AssemblyInfo.cs b/mcs/class/Facades/System.IO.FileSystem.AccessControl/AssemblyInfo.cs index 056e067985..f78fa7c140 100644 --- a/mcs/class/Facades/System.IO.FileSystem.AccessControl/AssemblyInfo.cs +++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Net.Ping/AssemblyInfo.cs b/mcs/class/Facades/System.Net.Ping/AssemblyInfo.cs index 00d2b6bddb..2e1f8f16a6 100644 --- a/mcs/class/Facades/System.Net.Ping/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Net.Ping/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Net.Sockets/AssemblyInfo.cs b/mcs/class/Facades/System.Net.Sockets/AssemblyInfo.cs index b81cf3cf99..1f3248cdf3 100644 --- a/mcs/class/Facades/System.Net.Sockets/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Net.Sockets/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Net.Sockets/Makefile b/mcs/class/Facades/System.Net.Sockets/Makefile index 497c054622..bf60d5fef6 100644 --- a/mcs/class/Facades/System.Net.Sockets/Makefile +++ b/mcs/class/Facades/System.Net.Sockets/Makefile @@ -14,6 +14,8 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System LIB_MCS_FLAGS = $(SIGN_FLAGS) +PLATFORM_DEBUG_FLAGS = + NO_TEST = yes include $(MCS_BUILD_DIR)/library.make diff --git a/mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs b/mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs index 27258a0831..ed555c0a82 100644 --- a/mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs +++ b/mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs @@ -27,6 +27,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.LingerOption))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.MulticastOption))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.NetworkStream))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolFamily))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolType))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SelectMode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SendPacketsElement))] @@ -38,16 +39,13 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketInformationOptions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketOptionLevel))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketOptionName))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveFromResult))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveMessageFromResult))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketShutdown))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketTaskExtensions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketType))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TcpClient))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TcpListener))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.TransmitFileOptions))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpClient))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpReceiveResult))] - -#if NETSTANDARD -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveFromResult))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveMessageFromResult))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketTaskExtensions))] -#endif diff --git a/mcs/class/Facades/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs b/mcs/class/Facades/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs new file mode 100644 index 0000000000..ba036fac36 --- /dev/null +++ b/mcs/class/Facades/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs @@ -0,0 +1,35 @@ +// +// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("System.Reflection.DispatchProxy.dll")] +[assembly: AssemblyDescription ("System.Reflection.DispatchProxy.dll")] +[assembly: AssemblyDefaultAlias ("System.Reflection.DispatchProxy.dll")] +[assembly: AssemblyCompany ("Xamarin, Inc.")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] +[assembly: AssemblyVersion ("4.0.3.0")] +[assembly: AssemblyInformationalVersion ("4.0.0.0")] +[assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile b/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile new file mode 100644 index 0000000000..0dab068925 --- /dev/null +++ b/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile @@ -0,0 +1,19 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/System.Reflection.DispatchProxy +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = System.Reflection.DispatchProxy.dll + +KEY_FILE = ../../msfinal.pub +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 +LIB_REFS = System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make diff --git a/mcs/class/Facades/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources b/mcs/class/Facades/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources new file mode 100644 index 0000000000..2da8fa6bf9 --- /dev/null +++ b/mcs/class/Facades/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources @@ -0,0 +1,3 @@ +../../../build/common/MonoTODOAttribute.cs +Assembly/AssemblyInfo.cs +System.Reflection/DispatchProxy.cs diff --git a/mcs/class/System.Reflection.DispatchProxy/System.Reflection/DispatchProxy.cs b/mcs/class/Facades/System.Reflection.DispatchProxy/System.Reflection/DispatchProxy.cs similarity index 100% rename from mcs/class/System.Reflection.DispatchProxy/System.Reflection/DispatchProxy.cs rename to mcs/class/Facades/System.Reflection.DispatchProxy/System.Reflection/DispatchProxy.cs diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/AssemblyInfo.cs b/mcs/class/Facades/System.Reflection.TypeExtensions/AssemblyInfo.cs index f60f7d0e6e..005d1f35ae 100644 --- a/mcs/class/Facades/System.Reflection.TypeExtensions/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Reflection.TypeExtensions/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.1.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs new file mode 100644 index 0000000000..e354927ba5 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs @@ -0,0 +1,46 @@ +// +// AssemblyInfo.cs +// +// Author: +// Alexander Köplinger (alexander.koeplinger@xamarin.com) +// +// (C) 2016 Xamarin, Inc. +// + +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("System.Runtime.InteropServices.RuntimeInformation.dll")] +[assembly: AssemblyDescription ("System.Runtime.InteropServices.RuntimeInformation.dll")] +[assembly: AssemblyDefaultAlias ("System.Runtime.InteropServices.RuntimeInformation.dll")] + +[assembly: AssemblyCompany ("Xamarin, Inc.")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] +[assembly: AssemblyVersion ("4.0.3.0")] +[assembly: AssemblyInformationalVersion ("4.0.0.0")] +[assembly: AssemblyFileVersion ("4.0.0.0")] + +[assembly: CLSCompliant (true)] diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile new file mode 100644 index 0000000000..fe76e860ba --- /dev/null +++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile @@ -0,0 +1,24 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/System.Runtime.InteropServices.RuntimeInformation +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll + +RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx + +KEY_FILE = ../../msfinal.pub +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699,436 +LIB_REFS = System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make + + + diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources new file mode 100644 index 0000000000..2bbe8a7992 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources @@ -0,0 +1,7 @@ +Assembly/AssemblyInfo.cs +System.Runtime.InteropServices/RuntimeInformation.cs + +corefx/SR.cs + +../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs +../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/Architecture.cs diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs similarity index 94% rename from mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs rename to mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs index d775167495..4a515083c4 100644 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs +++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs @@ -35,12 +35,9 @@ namespace System.Runtime.InteropServices { public static class RuntimeInformation { - [DllImport ("__Internal")] - extern static string mono_get_runtime_build_info (); - public static string FrameworkDescription { get { - return mono_get_runtime_build_info (); + return "Mono " + Mono.Runtime.GetDisplayName (); } } diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/corefx/SR.cs b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/corefx/SR.cs new file mode 100644 index 0000000000..ce8c7936c4 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/corefx/SR.cs @@ -0,0 +1,8 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string Argument_EmptyValue = "Value cannot be empty."; +} diff --git a/mcs/class/Facades/System.Runtime.Loader/AssemblyExtensions.cs b/mcs/class/Facades/System.Runtime.Loader/AssemblyExtensions.cs new file mode 100644 index 0000000000..105024bc12 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Loader/AssemblyExtensions.cs @@ -0,0 +1,39 @@ +// +// AssemblyExtensions.cs +// +// Authors: +// Marek Safar +// +// Copyright (C) 2016 Xamarin Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + + +namespace System.Reflection.Metadata +{ + public static class AssemblyExtensions + { + public static unsafe bool TryGetRawMetadata (this System.Reflection.Assembly assembly, out byte* blob, out int length) + { + throw new NotImplementedException (); + } + } +} \ No newline at end of file diff --git a/mcs/class/Facades/System.Runtime.Loader/AssemblyInfo.cs b/mcs/class/Facades/System.Runtime.Loader/AssemblyInfo.cs new file mode 100644 index 0000000000..d362786aee --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Loader/AssemblyInfo.cs @@ -0,0 +1,35 @@ +// +// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("System.Runtime.Loader.dll")] +[assembly: AssemblyDescription ("System.Runtime.Loader.dll")] +[assembly: AssemblyDefaultAlias ("System.Runtime.Loader.dll")] +[assembly: AssemblyCompany ("Xamarin, Inc.")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] +[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyInformationalVersion ("4.0.0.0")] +[assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/corlib/System.Runtime.Loader/AssemblyLoadContext.cs b/mcs/class/Facades/System.Runtime.Loader/AssemblyLoadContext.cs similarity index 99% rename from mcs/class/corlib/System.Runtime.Loader/AssemblyLoadContext.cs rename to mcs/class/Facades/System.Runtime.Loader/AssemblyLoadContext.cs index 3297ac2342..1e9b5c8dc6 100644 --- a/mcs/class/corlib/System.Runtime.Loader/AssemblyLoadContext.cs +++ b/mcs/class/Facades/System.Runtime.Loader/AssemblyLoadContext.cs @@ -26,8 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NETSTANDARD - namespace System.Runtime.Loader { // @@ -106,5 +104,3 @@ namespace System.Runtime.Loader #pragma warning restore } } - -#endif \ No newline at end of file diff --git a/mcs/class/Facades/System.Runtime.Loader/Makefile b/mcs/class/Facades/System.Runtime.Loader/Makefile new file mode 100644 index 0000000000..46af65f9f1 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Loader/Makefile @@ -0,0 +1,21 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/System.Runtime.Loader +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = System.Runtime.Loader.dll + +KEY_FILE = ../../msfinal.pub +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 +LIB_REFS = System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make + + diff --git a/mcs/class/Facades/System.Runtime.Loader/System.Runtime.Loader.dll.sources b/mcs/class/Facades/System.Runtime.Loader/System.Runtime.Loader.dll.sources new file mode 100644 index 0000000000..adf4e593e3 --- /dev/null +++ b/mcs/class/Facades/System.Runtime.Loader/System.Runtime.Loader.dll.sources @@ -0,0 +1,3 @@ +AssemblyInfo.cs +AssemblyExtensions.cs +AssemblyLoadContext.cs diff --git a/mcs/class/Facades/System.Runtime.Serialization.Formatters/AssemblyInfo.cs b/mcs/class/Facades/System.Runtime.Serialization.Formatters/AssemblyInfo.cs index b717fe3b09..667e977c27 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Formatters/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Runtime.Serialization.Formatters/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/AssemblyInfo.cs b/mcs/class/Facades/System.Runtime.Serialization.Primitives/AssemblyInfo.cs index 44acc90761..9ae9343c47 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.1.0")] +[assembly: AssemblyVersion ("4.2.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/TypeForwarders.cs b/mcs/class/Facades/System.Runtime.Serialization.Primitives/TypeForwarders.cs index 57b2d4db09..ea71c80449 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/TypeForwarders.cs +++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/TypeForwarders.cs @@ -25,7 +25,11 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataContractAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataMemberAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.EnumMemberAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExportOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExtensionDataObject))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IExtensibleDataObject))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IgnoreDataMemberAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.KnownTypeAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializedAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializingAttribute))] @@ -33,4 +37,13 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnSerializingAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContext))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContextStates))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XmlSerializableServices))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XPathQueryGenerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XsdDataContractExporter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IFragmentCapableXmlDictionaryWriter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IStreamProvider))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryReaderInitializer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryWriterInitializer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextReaderInitializer))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextWriterInitializer))] diff --git a/mcs/class/Facades/System.Security.AccessControl/AssemblyInfo.cs b/mcs/class/Facades/System.Security.AccessControl/AssemblyInfo.cs index db93dea919..ef22ddbd86 100644 --- a/mcs/class/Facades/System.Security.AccessControl/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.AccessControl/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.1.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/AssemblyInfo.cs b/mcs/class/Facades/System.Security.Cryptography.Algorithms/AssemblyInfo.cs index c41572f45b..3e0e376278 100644 --- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.2.0.0")] +[assembly: AssemblyVersion ("4.3.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs b/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs index ff615bbfda..2a7c09f471 100644 --- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs +++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs @@ -21,27 +21,55 @@ // [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Aes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AesManaged))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeFormatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureFormatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CryptoConfig))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DeriveBytes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DES))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSA))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSAParameters))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureFormatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDiffieHellmanPublicKey))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDsa))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACMD5))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA1))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA256))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA384))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA512))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MaskGenerationMethod))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MD5))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.PKCS1MaskGenerationMethod))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RandomNumberGenerator))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RC2))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rfc2898DeriveBytes))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rijndael))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RijndaelManaged))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSA))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPadding))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPaddingMode))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeFormatter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAParameters))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureDeformatter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureFormatter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePadding))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePaddingMode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1Managed))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256Managed))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384Managed))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512Managed))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SignatureDescription))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.TripleDES))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))] diff --git a/mcs/class/Facades/System.Security.Cryptography.Pkcs/AssemblyInfo.cs b/mcs/class/Facades/System.Security.Cryptography.Pkcs/AssemblyInfo.cs index 1666aa8bfd..dc13964acc 100644 --- a/mcs/class/Facades/System.Security.Cryptography.Pkcs/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.Cryptography.Pkcs/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/AssemblyInfo.cs b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/AssemblyInfo.cs index cccb2f29ca..ba8da75d32 100644 --- a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Security.Principal.Windows/AssemblyInfo.cs b/mcs/class/Facades/System.Security.Principal.Windows/AssemblyInfo.cs index b7abc6857f..b4910cd133 100644 --- a/mcs/class/Facades/System.Security.Principal.Windows/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.Principal.Windows/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.1.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Security.SecureString/AssemblyInfo.cs b/mcs/class/Facades/System.Security.SecureString/AssemblyInfo.cs index 72ee369b04..47dba143f0 100644 --- a/mcs/class/Facades/System.Security.SecureString/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Security.SecureString/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.1.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.Duplex/AssemblyInfo.cs index cc10b16483..28a4ce5f35 100644 --- a/mcs/class/Facades/System.ServiceModel.Duplex/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceModel.Duplex/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.0.3.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceModel.Http/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.Http/AssemblyInfo.cs index a62721f422..69ff3416e3 100644 --- a/mcs/class/Facades/System.ServiceModel.Http/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceModel.Http/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.1.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.NetTcp/AssemblyInfo.cs index a62721f422..69ff3416e3 100644 --- a/mcs/class/Facades/System.ServiceModel.NetTcp/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceModel.NetTcp/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.1.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.Primitives/AssemblyInfo.cs index d3a2d80f6c..262afab0c9 100644 --- a/mcs/class/Facades/System.ServiceModel.Primitives/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceModel.Primitives/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/TypeForwarders.cs b/mcs/class/Facades/System.ServiceModel.Primitives/TypeForwarders.cs index 3be79604b4..86c999184c 100644 --- a/mcs/class/Facades/System.ServiceModel.Primitives/TypeForwarders.cs +++ b/mcs/class/Facades/System.ServiceModel.Primitives/TypeForwarders.cs @@ -20,6 +20,8 @@ // THE SOFTWARE. // +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.KeyedByTypeCollection<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.Generic.SynchronizedCollection<>))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IdentityModel.Selectors.X509CertificateValidator))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ActionNotSupportedException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ChannelFactory))] @@ -76,6 +78,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.RequestContext))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TextMessageEncodingBindingElement))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TransportBindingElement))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.UnderstoodHeaders))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ClientBase<>))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.CommunicationException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.CommunicationObjectAbortedException))] @@ -103,14 +106,18 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescription))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescriptionCollection))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.ServiceEndpoint))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.XmlSerializerOperationBehavior))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientOperation))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientRuntime))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchOperation))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchRuntime))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.EndpointDispatcher))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.FaultContractInfo))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IChannelInitializer))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IClientMessageFormatter))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IClientMessageInspector))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IClientOperationSelector))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IInteractiveChannelInitializer))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.IParameterInspector))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.EndpointAddress))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.EndpointAddressBuilder))] @@ -118,6 +125,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.EndpointNotFoundException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.EnvelopeVersion))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ExceptionDetail))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ExtensionCollection<>))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.FaultCode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.FaultContractAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.FaultException))] @@ -137,18 +145,22 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageContractMemberAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageCredentialType))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageHeader<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageHeaderArrayAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageHeaderAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageHeaderException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageParameterAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessagePropertyAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.OperationContext))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.OperationContextScope))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.OperationContractAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.OperationFormatStyle))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.OperationFormatUse))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ProtocolException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.QuotaExceededException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.HttpDigestClientCredential))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.MessageSecurityException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecurityAccessDeniedException))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecurityNegotiationException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.UserNamePasswordClientCredential))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.WindowsClientCredential))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.X509ServiceCertificateAuthentication))] @@ -160,6 +172,7 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ServiceActivationException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ServiceContractAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ServiceKnownTypeAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.SessionMode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.TransferMode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.UnknownMessageReceivedEventArgs))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.XmlSerializerFormatAttribute))] diff --git a/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs index d2c6374507..0f5d98318c 100644 --- a/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.0.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceProcess.ServiceController/AssemblyInfo.cs index 3abe68c0dc..49f6621b00 100644 --- a/mcs/class/Facades/System.ServiceProcess.ServiceController/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.1.0.0")] +[assembly: AssemblyVersion ("4.2.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs b/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs index 5dbf4041b3..d273b9d243 100644 --- a/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs +++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs @@ -31,6 +31,7 @@ #if MOBILE || XAMMAC_4_5 using System; +using System.Runtime.Serialization; namespace System.ServiceProcess { @@ -50,6 +51,11 @@ namespace System.ServiceProcess { throw new PlatformNotSupportedException (); } + + protected TimeoutException (SerializationInfo info, StreamingContext context) + { + throw new PlatformNotSupportedException (); + } } } diff --git a/mcs/class/Facades/System.Text.Encoding.CodePages/AssemblyInfo.cs b/mcs/class/Facades/System.Text.Encoding.CodePages/AssemblyInfo.cs index dde53209d5..f97526cbe1 100644 --- a/mcs/class/Facades/System.Text.Encoding.CodePages/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Text.Encoding.CodePages/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.1.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Threading.AccessControl/AssemblyInfo.cs b/mcs/class/Facades/System.Threading.AccessControl/AssemblyInfo.cs index 818bdcee0c..52f17f51fc 100644 --- a/mcs/class/Facades/System.Threading.AccessControl/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Threading.AccessControl/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.2.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Threading.Overlapped/AssemblyInfo.cs b/mcs/class/Facades/System.Threading.Overlapped/AssemblyInfo.cs index 84dca4216a..3566d5fbcb 100644 --- a/mcs/class/Facades/System.Threading.Overlapped/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Threading.Overlapped/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.1.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Threading.Overlapped/Makefile b/mcs/class/Facades/System.Threading.Overlapped/Makefile index 71630db2e9..44d534b184 100644 --- a/mcs/class/Facades/System.Threading.Overlapped/Makefile +++ b/mcs/class/Facades/System.Threading.Overlapped/Makefile @@ -12,10 +12,9 @@ LIBRARY = System.Threading.Overlapped.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) -unsafe -nowarn:3021 +LIB_MCS_FLAGS = $(SIGN_FLAGS) -RESX_RESOURCE_STRING = \ - ../../../../external/corefx/src/System.Threading.Overlapped/src/Resources/Strings.resx +PLATFORM_DEBUG_FLAGS = NO_TEST = yes diff --git a/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources b/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources index a8d9932de8..719628dc7c 100644 --- a/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources +++ b/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources @@ -1,10 +1,2 @@ TypeForwarders.cs AssemblyInfo.cs - -corefx/SR.cs - -../../../../external/corefx/src/Common/src/System/HResults.cs -../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandle.cs -../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandleOverlapped.cs -../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolPreAllocatedOverlapped.cs -../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/DeferredDisposableLifetime.cs diff --git a/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs b/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs index dd272df5d9..70d43c05ae 100644 --- a/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs +++ b/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs @@ -22,3 +22,6 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.IOCompletionCallback))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.NativeOverlapped))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Overlapped))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.PreAllocatedOverlapped))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.ThreadPoolBoundHandle))] diff --git a/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs b/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs deleted file mode 100644 index 7c2846a6b4..0000000000 --- a/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs +++ /dev/null @@ -1,13 +0,0 @@ -// -// This file was generated by resx2sr tool -// - -partial class SR -{ - public const string Argument_AlreadyBoundOrSyncHandle = "'handle' has already been bound to the thread pool, or was not opened for asynchronous I/O."; - public const string Argument_InvalidHandle = "'handle' has been disposed or is an invalid handle."; - public const string Argument_NativeOverlappedAlreadyFree = "'overlapped' has already been freed."; - public const string Argument_NativeOverlappedWrongBoundHandle = "'overlapped' was not allocated by this ThreadPoolBoundHandle instance."; - public const string Argument_PreAllocatedAlreadyAllocated = "'preAllocated' is already in use."; - public const string InvalidOperation_NativeOverlappedReused = "NativeOverlapped cannot be reused for multiple operations."; -} diff --git a/mcs/class/Facades/System.ValueTuple/AssemblyInfo.cs b/mcs/class/Facades/System.ValueTuple/AssemblyInfo.cs index fda0d3b249..a0747feed5 100644 --- a/mcs/class/Facades/System.ValueTuple/AssemblyInfo.cs +++ b/mcs/class/Facades/System.ValueTuple/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.0.3.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/AssemblyInfo.cs b/mcs/class/Facades/System.Xml.ReaderWriter/AssemblyInfo.cs index 1f288e75f8..5f03c15627 100644 --- a/mcs/class/Facades/System.Xml.ReaderWriter/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Xml.ReaderWriter/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.10.0")] +[assembly: AssemblyVersion ("4.1.0.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/AssemblyInfo.cs b/mcs/class/Facades/System.Xml.XPath.XDocument/AssemblyInfo.cs index 00626f58ee..f2e8ea4a59 100644 --- a/mcs/class/Facades/System.Xml.XPath.XDocument/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Xml.XPath.XDocument/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.1.0")] +[assembly: AssemblyVersion ("4.1.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Assembly/AssemblyInfo.cs b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Assembly/AssemblyInfo.cs new file mode 100644 index 0000000000..8bfb4e9aad --- /dev/null +++ b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Assembly/AssemblyInfo.cs @@ -0,0 +1,44 @@ +// +// AssemblyInfo.cs +// +// Author: +// Alexander Köplinger (alexander.koeplinger@xamarin.com) +// +// (C) 2016 Xamarin, Inc. +// + +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("System.Xml.XPath.XmlDocument.dll")] +[assembly: AssemblyDescription ("System.Xml.XPath.XmlDocument.dll")] +[assembly: AssemblyDefaultAlias ("System.Xml.XPath.XmlDocument.dll")] +[assembly: AssemblyCompany ("Xamarin, Inc.")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] +[assembly: AssemblyVersion ("4.0.2.0")] +[assembly: AssemblyInformationalVersion ("4.0.0.0")] +[assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile new file mode 100644 index 0000000000..38259e63b5 --- /dev/null +++ b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile @@ -0,0 +1,19 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/System.Xml.XPath.XmlDocument +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = System.Xml.XPath.XmlDocument.dll + +KEY_FILE = ../../msfinal.pub +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 +LIB_REFS = System System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make diff --git a/mcs/class/Facades/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.dll.sources b/mcs/class/Facades/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.dll.sources new file mode 100644 index 0000000000..583dc25e5e --- /dev/null +++ b/mcs/class/Facades/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.dll.sources @@ -0,0 +1,3 @@ +../../../build/common/MonoTODOAttribute.cs +Assembly/AssemblyInfo.cs +System.Xml/XmlDocumentXPathExtensions.cs diff --git a/mcs/class/System.Xml.XPath.XmlDocument/System.Xml/XmlDocumentXPathExtensions.cs b/mcs/class/Facades/System.Xml.XPath.XmlDocument/System.Xml/XmlDocumentXPathExtensions.cs similarity index 100% rename from mcs/class/System.Xml.XPath.XmlDocument/System.Xml/XmlDocumentXPathExtensions.cs rename to mcs/class/Facades/System.Xml.XPath.XmlDocument/System.Xml/XmlDocumentXPathExtensions.cs diff --git a/mcs/class/Facades/netstandard/AssemblyInfo.cs b/mcs/class/Facades/netstandard/AssemblyInfo.cs new file mode 100644 index 0000000000..5580b633bd --- /dev/null +++ b/mcs/class/Facades/netstandard/AssemblyInfo.cs @@ -0,0 +1,35 @@ +// +// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("netstandard.dll")] +[assembly: AssemblyDescription ("netstandard.dll")] +[assembly: AssemblyDefaultAlias ("netstandard.dll")] +[assembly: AssemblyCompany ("Xamarin, Inc.")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] +[assembly: AssemblyVersion ("2.0.0.0")] +[assembly: AssemblyInformationalVersion ("2.0.0.0")] +[assembly: AssemblyFileVersion ("2.0.0.0")] diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile new file mode 100644 index 0000000000..fd6e24e65b --- /dev/null +++ b/mcs/class/Facades/netstandard/Makefile @@ -0,0 +1,63 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/netstandard +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = netstandard.dll + +KEY_FILE = ../../Open.snk +LIBRARY_SNK = $(KEY_FILE) +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 /nowarn:618 +LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \ +System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem Facades/System.Runtime.InteropServices.RuntimeInformation \ +Facades/System.Security.Cryptography.Algorithms Facades/System.Globalization.Extensions Facades/System.Data.Common \ +Facades/System.Diagnostics.StackTrace Facades/System.Runtime.Serialization.Xml Facades/System.Runtime.Serialization.Primitives \ +Facades/System.Security.SecureString Facades/System.Threading.Overlapped Facades/System.Xml.XPath.XDocument + +LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) + +ifeq ($(PROFILE),xammac_net_4_5) +LIB_REFS += System.Web.Services +else ifeq (2.1, $(FRAMEWORK_VERSION)) +LIB_REFS += System.Web.Services +else +LIB_REFS += System.Web +endif + +# profiles which build a System.Drawing.dll in the repo +REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE)) + +ifdef REPO_DRAWING_DEP +LIB_REFS += System.Drawing +else + +# xammac_net_4_5 and the testing_* profiles are special, they don't build +# System.Drawing.dll or equivalent neither in Mono nor in the XM repo. +# For now we typeforward the drawing types to the System.Drawing.Primitives.dll +# facade where they are embedded. +# TODO: find a better solution. +EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE)) + +ifdef EMBEDDED_DRAWING_DEP +LIB_REFS += Facades/System.Drawing.Primitives +else +# When System.Drawing.dll is not built in the Mono repo but in +# the product repo like in the XI/XA case we need to pass in a reference +# to the assembly containing drawing types like Rectangle etc. from there. +# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE. +LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE) +endif + +endif + +PLATFORM_DEBUG_FLAGS = + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make + + diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs.REMOVED.git-id b/mcs/class/Facades/netstandard/TypeForwarders.cs.REMOVED.git-id new file mode 100644 index 0000000000..a4551acd4c --- /dev/null +++ b/mcs/class/Facades/netstandard/TypeForwarders.cs.REMOVED.git-id @@ -0,0 +1 @@ +dcddd3e6e9324e60f390e4106860c5e02972cb55 \ No newline at end of file diff --git a/mcs/class/Facades/netstandard/netstandard.dll.sources b/mcs/class/Facades/netstandard/netstandard.dll.sources new file mode 100644 index 0000000000..719628dc7c --- /dev/null +++ b/mcs/class/Facades/netstandard/netstandard.dll.sources @@ -0,0 +1,2 @@ +TypeForwarders.cs +AssemblyInfo.cs diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index a2409a83b8..b21f1cda47 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -13,7 +13,7 @@ System.ServiceModel.Security System.Text.Encoding.Extensions System.Text.Encodin System.Threading.Tasks System.Threading.Timer System.Threading System.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer \ System.Runtime.Handles System.ServiceModel.Duplex System.ServiceModel.NetTcp \ Microsoft.Win32.Primitives Microsoft.Win32.Registry System.AppContext System.Collections.NonGeneric System.Collections.Specialized System.ComponentModel.Primitives \ -System.ComponentModel.TypeConverter System.Console System.Data.Common System.Data.SqlClient System.Diagnostics.FileVersionInfo \ +System.ComponentModel.TypeConverter System.Console System.Data.SqlClient System.Diagnostics.FileVersionInfo \ System.Diagnostics.Process System.Diagnostics.TextWriterTraceListener System.Diagnostics.TraceEvent System.Diagnostics.TraceSource System.Globalization.Calendars \ System.IO.Compression.ZipFile System.IO.FileSystem System.IO.FileSystem.DriveInfo System.IO.FileSystem.Primitives \ System.IO.IsolatedStorage System.IO.MemoryMappedFiles System.IO.UnmanagedMemoryStream System.Net.AuthenticationManager System.Net.Cache \ @@ -23,25 +23,33 @@ System.Security.AccessControl System.Security.Claims System.Security.Cryptograph System.Security.Cryptography.Encryption.Aes System.Security.Cryptography.Encryption.ECDiffieHellman System.Security.Cryptography.Encryption.ECDsa System.Security.Cryptography.Hashing \ System.Security.Cryptography.Hashing.Algorithms System.Security.Cryptography.RSA System.Security.Cryptography.RandomNumberGenerator \ System.Security.Principal.Windows System.Threading.Thread System.Threading.ThreadPool \ -System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl System.Diagnostics.StackTrace System.Globalization.Extensions \ +System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl \ System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions System.Reflection.Emit.Lightweight System.Reflection.Emit.ILGeneration System.Reflection.Emit \ -System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.ValueTuple System.Xml.XPath.XDocument \ +System.Threading.AccessControl System.ValueTuple \ System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes # common_SUBDIRS dependencies common_DEPS_SUBDIRS = System.Security.Cryptography.X509Certificates System.ServiceModel.Primitives System.Runtime.Serialization.Primitives \ -System.Runtime.Serialization.Xml System.Security.Cryptography.Algorithms +System.Runtime.Serialization.Xml System.Security.Cryptography.Algorithms System.Globalization.Extensions System.Data.Common \ +System.Diagnostics.StackTrace System.Security.SecureString System.Threading.Overlapped System.Xml.XPath.XDocument System.Runtime.InteropServices.RuntimeInformation -drawing_DEPS_SUBDIRS = System.Drawing.Primitives +netstandard_drawing_SUBDIRS = System.Drawing.Primitives netstandard monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) +# We don't build netstandard/System.Drawing.Primitives on monotouch etc. profiles by default, +# except when EXTERNAL_FACADE_DRAWING_REFERENCE is defined which allows us to build it in Mono CI +# (since the dependent drawing types are normally built in the product repos). +ifdef EXTERNAL_FACADE_DRAWING_REFERENCE +monotouch_SUBDIRS += $(netstandard_drawing_SUBDIRS) +endif + testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS) testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) -net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(drawing_DEPS_SUBDIRS) +net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \ @@ -69,12 +77,14 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS) monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) -winaot_PARALLEL_SUBDIRS := +winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -orbis_PARALLEL_SUBDIRS := +orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \ -System.Security.Cryptography.Cng +System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl diff --git a/mcs/class/Makefile b/mcs/class/Makefile index a3e8b1aa0f..a9610f239c 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -18,15 +18,10 @@ basic_SUBDIRS := \ System.ComponentModel.Composition.4.5 \ System.Numerics \ System.Xml.Linq \ - System.Runtime.InteropServices.RuntimeInformation \ Mono.Cecil \ $(MCS_MODE_dirs) \ ../tools/cil-stringreplacer -# resgen is corlib specific so we need to wait until corlib is build -# and build it just a step before first dll needs it -resgen_dir = ../tools/resgen - build_SUBDIRS := \ corlib \ Mono.Security \ @@ -37,8 +32,8 @@ build_SUBDIRS := \ System.ComponentModel.Composition.4.5 \ System.Numerics \ System.Xml.Linq \ - System.Runtime.InteropServices.RuntimeInformation \ System.IO.Compression \ + System.Drawing \ Mono.Cecil \ $(MCS_MODE_dirs) \ Mono.CompilerServices.SymbolWriter \ @@ -86,9 +81,6 @@ mobile_common_dirs := \ System.Xml.Serialization \ Mono.CSharp \ Microsoft.CSharp \ - System.Runtime.InteropServices.RuntimeInformation \ - System.Reflection.DispatchProxy \ - System.Xml.XPath.XmlDocument \ System.Reflection.Context \ System.Net.Http.WinHttpHandler @@ -111,10 +103,13 @@ monodroid_dirs := \ $(mobile_common_dirs) \ Mono.CompilerServices.SymbolWriter \ Mono.Btls.Interface \ + Mono.Posix \ $(pcl_facade_dirs) monotouch_dirs := \ - $(testing_aot_full_dirs) + $(mobile_common_dirs) \ + Mono.Simd \ + $(pcl_facade_dirs) monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs)) monotouch_tv_dirs := $(monotouch_dirs) @@ -130,7 +125,10 @@ monotouch_runtime_dirs := \ monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs)) monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs) -winaot_dirs := $(monotouch_dirs) System.Drawing +winaot_dirs := \ + $(mobile_common_dirs) \ + System.Drawing \ + $(pcl_facade_dirs) xammac_4_5_dirs := \ corlib \ @@ -176,7 +174,6 @@ xammac_4_5_dirs := \ System.Data.Linq \ System.Net.Http \ System.Net.Http.WebRequest \ - System.Runtime.InteropServices.RuntimeInformation \ System.Reflection.Context \ System.Net.Http.WinHttpHandler \ $(pcl_facade_dirs) @@ -191,10 +188,9 @@ net_4_x_dirs := \ System.Core \ System.Security \ System.Configuration \ - $(resgen_dir) \ + System.Drawing \ System.IO.Compression \ System.IO.Compression.FileSystem \ - System.Drawing \ System.Transactions \ System.EnterpriseServices \ Mono.Data.Tds \ @@ -263,8 +259,7 @@ net_4_x_dirs := \ System.Net.Http.Formatting \ System.Web.Http \ System.Web.Http.SelfHost \ - System.Web.Http.WebHost \ - System.Runtime.InteropServices.RuntimeInformation + System.Web.Http.WebHost # These are the subdirs which depends on libs in net_4_x_dirs # or have proper dependencies between each other @@ -334,6 +329,11 @@ xbuild_4_0_dirs := \ $(xbuild_2_0_dirs) \ Microsoft.Build +orbis_dirs := \ + $(filter-out Microsoft.CSharp Mono.CSharp Mono.Data.Sqlite,$(mobile_common_dirs)) \ + System.Drawing \ + $(pcl_facade_dirs) + monodroid_SUBDIRS := $(monodroid_dirs) monotouch_SUBDIRS := $(monotouch_dirs) monotouch_watch_SUBDIRS := $(monotouch_watch_dirs) @@ -351,7 +351,7 @@ net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs) xbuild_12_SUBDIRS := $(xbuild_4_0_dirs) xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks winaot_SUBDIRS := $(winaot_dirs) -orbis_SUBDIRS := $(monotouch_dirs) +orbis_SUBDIRS := $(orbis_dirs) include ../build/rules.make @@ -394,7 +394,7 @@ monolite_dir := monolite/$(MONO_CORLIB_VERSION) # Files needed to bootstrap C# compiler build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \ - System.Numerics.dll System.Xml.Linq.dll System.Runtime.InteropServices.RuntimeInformation.dll \ + System.Numerics.dll System.Xml.Linq.dll \ Facades/System.Collections.Concurrent.dll Facades/System.Linq.dll Facades/System.Runtime.dll Facades/System.Collections.dll \ Facades/System.Reflection.Extensions.dll Facades/System.Text.Encoding.Extensions.dll Facades/System.Diagnostics.Debug.dll \ Facades/System.Reflection.Primitives.dll Facades/System.Text.Encoding.dll Facades/System.Diagnostics.Tools.dll Facades/System.Reflection.dll \ diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs index 9800c6883f..d75ac2543e 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs @@ -168,19 +168,19 @@ namespace Microsoft.Build.BuildEngine { yield return kvp.Value; } - public void RemoveProperty (BuildProperty propertyToRemove) + public void RemoveProperty (BuildProperty property) { - if (propertyToRemove == null) - throw new ArgumentNullException ("propertyToRemove"); + if (property == null) + throw new ArgumentNullException ("property"); if (FromXml) { - if (!propertyToRemove.FromXml) + if (!property.FromXml) throw new InvalidOperationException ("The specified property does not belong to the current property group."); - propertyToRemove.XmlElement.ParentNode.RemoveChild (propertyToRemove.XmlElement); - properties.Remove (propertyToRemove); + property.XmlElement.ParentNode.RemoveChild (property.XmlElement); + properties.Remove (property); } else - propertiesByName.Remove (propertyToRemove.Name); + propertiesByName.Remove (property.Name); } public void RemoveProperty (string propertyName) diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs index ff6acda08f..2e3e06f47a 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs @@ -296,14 +296,14 @@ namespace Microsoft.Build.BuildEngine return build_records.GetOrAdd (key, _ => new BuildRecord (this)); } - public void BuildStartedHandler (object sender, BuildStartedEventArgs args) + public void BuildStartedHandler (object sender, BuildStartedEventArgs e) { - GetBuildRecord (sender).BuildStartedHandler (sender, args); + GetBuildRecord (sender).BuildStartedHandler (sender, e); } - public void BuildFinishedHandler (object sender, BuildFinishedEventArgs args) + public void BuildFinishedHandler (object sender, BuildFinishedEventArgs e) { - GetBuildRecord (sender).BuildFinishedHandler (args); + GetBuildRecord (sender).BuildFinishedHandler (e); ((IDictionary) build_records).Remove (sender); } @@ -315,47 +315,47 @@ namespace Microsoft.Build.BuildEngine { GetBuildRecord (sender).PopEvent (args); } - public void ProjectStartedHandler (object sender, ProjectStartedEventArgs args) + public void ProjectStartedHandler (object sender, ProjectStartedEventArgs e) { - GetBuildRecord (sender).ProjectStartedHandler (args); + GetBuildRecord (sender).ProjectStartedHandler (e); } - public void ProjectFinishedHandler (object sender, ProjectFinishedEventArgs args) + public void ProjectFinishedHandler (object sender, ProjectFinishedEventArgs e) { - GetBuildRecord (sender).ProjectFinishedHandler (args); + GetBuildRecord (sender).ProjectFinishedHandler (e); } - public void TargetStartedHandler (object sender, TargetStartedEventArgs args) + public void TargetStartedHandler (object sender, TargetStartedEventArgs e) { - GetBuildRecord (sender).TargetStartedHandler (args); + GetBuildRecord (sender).TargetStartedHandler (e); } - public void TargetFinishedHandler (object sender, TargetFinishedEventArgs args) + public void TargetFinishedHandler (object sender, TargetFinishedEventArgs e) { - GetBuildRecord (sender).TargetFinishedHandler (args); + GetBuildRecord (sender).TargetFinishedHandler (e); } - public void TaskStartedHandler (object sender, TaskStartedEventArgs args) + public void TaskStartedHandler (object sender, TaskStartedEventArgs e) { - GetBuildRecord (sender).TaskStartedHandler (args); + GetBuildRecord (sender).TaskStartedHandler (e); } - public void TaskFinishedHandler (object sender, TaskFinishedEventArgs args) + public void TaskFinishedHandler (object sender, TaskFinishedEventArgs e) { - GetBuildRecord (sender).TaskFinishedHandler (args); + GetBuildRecord (sender).TaskFinishedHandler (e); } - public void MessageHandler (object sender, BuildMessageEventArgs args) + public void MessageHandler (object sender, BuildMessageEventArgs e) { - GetBuildRecord (sender).MessageHandler (args); + GetBuildRecord (sender).MessageHandler (e); } - public void WarningHandler (object sender, BuildWarningEventArgs args) + public void WarningHandler (object sender, BuildWarningEventArgs e) { - GetBuildRecord (sender).WarningHandler (args); + GetBuildRecord (sender).WarningHandler (e); } - public void ErrorHandler (object sender, BuildErrorEventArgs args) + public void ErrorHandler (object sender, BuildErrorEventArgs e) { - GetBuildRecord (sender).ErrorHandler (args); + GetBuildRecord (sender).ErrorHandler (e); } [MonoTODO] - public void CustomEventHandler (object sender, CustomBuildEventArgs args) + public void CustomEventHandler (object sender, CustomBuildEventArgs e) { - build_records [sender].CustomHandler (args); + build_records [sender].CustomHandler (e); } void SetColor (ConsoleColor color) diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs index b4ed856238..b1e95b14c6 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs @@ -131,17 +131,17 @@ namespace Microsoft.Build.BuildEngine { } [MonoTODO ("Not tested")] - public void AddNewImport (string importLocation, - string importCondition) + public void AddNewImport (string projectFile, + string condition) { - if (importLocation == null) - throw new ArgumentNullException ("importLocation"); + if (projectFile == null) + throw new ArgumentNullException ("projectFile"); XmlElement importElement = xmlDocument.CreateElement ("Import", XmlNamespace); xmlDocument.DocumentElement.AppendChild (importElement); - importElement.SetAttribute ("Project", importLocation); - if (!String.IsNullOrEmpty (importCondition)) - importElement.SetAttribute ("Condition", importCondition); + importElement.SetAttribute ("Project", projectFile); + if (!String.IsNullOrEmpty (condition)) + importElement.SetAttribute ("Condition", condition); AddImport (importElement, null, false); MarkProjectAsDirty (); @@ -506,9 +506,9 @@ namespace Microsoft.Build.BuildEngine { Load (projectFileName, ProjectLoadSettings.None); } - public void Load (string projectFileName, ProjectLoadSettings settings) + public void Load (string projectFileName, ProjectLoadSettings projectLoadSettings) { - project_load_settings = settings; + project_load_settings = projectLoadSettings; if (String.IsNullOrEmpty (projectFileName)) throw new ArgumentNullException ("projectFileName"); @@ -644,7 +644,7 @@ namespace Microsoft.Build.BuildEngine { [MonoTODO] // NOTE: does not modify imported projects - public void RemoveItemGroupsWithMatchingCondition (string matchingCondition) + public void RemoveItemGroupsWithMatchingCondition (string matchCondition) { throw new NotImplementedException (); } @@ -697,9 +697,9 @@ namespace Microsoft.Build.BuildEngine { isDirty = false; } - public void Save (TextWriter outTextWriter) + public void Save (TextWriter textWriter) { - xmlDocument.Save (outTextWriter); + xmlDocument.Save (textWriter); isDirty = false; } @@ -733,12 +733,12 @@ namespace Microsoft.Build.BuildEngine { throw new NotImplementedException (); } - public void SetProjectExtensions (string id, string xmlText) + public void SetProjectExtensions (string id, string content) { if (id == null) throw new ArgumentNullException ("id"); - if (xmlText == null) - throw new ArgumentNullException ("xmlText"); + if (content == null) + throw new ArgumentNullException ("content"); XmlNode projectExtensions, node; @@ -749,7 +749,7 @@ namespace Microsoft.Build.BuildEngine { xmlDocument.DocumentElement.AppendChild (projectExtensions); node = xmlDocument.CreateElement (id, XmlNamespace); - node.InnerXml = xmlText; + node.InnerXml = content; projectExtensions.AppendChild (node); } else { node = xmlDocument.SelectSingleNode (String.Format ("/tns:Project/tns:ProjectExtensions/tns:{0}", id), XmlNamespaceManager); @@ -759,7 +759,7 @@ namespace Microsoft.Build.BuildEngine { projectExtensions.AppendChild (node); } - node.InnerXml = xmlText; + node.InnerXml = content; } diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs index dd1b9cc88c..e4f384bcea 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs @@ -111,11 +111,11 @@ namespace Microsoft.Build.BuildEngine { } // FIXME: shouldn't we remove it from XML? - public void RemoveTask (BuildTask buildTask) + public void RemoveTask (BuildTask taskElement) { - if (buildTask == null) - throw new ArgumentNullException ("buildTask"); - buildTasks.Remove (buildTask); + if (taskElement == null) + throw new ArgumentNullException ("taskElement"); + buildTasks.Remove (taskElement); } bool Build () diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs index 2710298972..794d33e0fc 100644 --- a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs +++ b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs @@ -45,9 +45,9 @@ namespace Microsoft.Build.Construction get { return Line == 0 ? File : String.Format ("{0} ({1}{2})", File, Line, Column != 0 ? "," + Column : String.Empty); } } - public override bool Equals (object other) + public override bool Equals (object obj) { - var o = other as ElementLocation; + var o = obj as ElementLocation; return (object) o != null && o.File == File && o.Line == Line && o.Column == Column; } diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs index 4189bf8b2f..e4263aa9de 100644 --- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs +++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs @@ -79,27 +79,27 @@ namespace Microsoft.Build.Evaluation + "{data.Items.Count} #Targets={data.Targets.Count}")] public class Project { - public Project (XmlReader xml) - : this (ProjectRootElement.Create (xml)) + public Project (XmlReader xmlReader) + : this (ProjectRootElement.Create (xmlReader)) { } - public Project (XmlReader xml, IDictionary globalProperties, + public Project (XmlReader xmlReader, IDictionary globalProperties, string toolsVersion) - : this (ProjectRootElement.Create (xml), globalProperties, toolsVersion) + : this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion) { } - public Project (XmlReader xml, IDictionary globalProperties, + public Project (XmlReader xmlReader, IDictionary globalProperties, string toolsVersion, ProjectCollection projectCollection) - : this (ProjectRootElement.Create (xml), globalProperties, toolsVersion, projectCollection) + : this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion, projectCollection) { } - public Project (XmlReader xml, IDictionary globalProperties, + public Project (XmlReader xmlReader, IDictionary globalProperties, string toolsVersion, ProjectCollection projectCollection, ProjectLoadSettings loadSettings) - : this (ProjectRootElement.Create (xml), globalProperties, toolsVersion, projectCollection, loadSettings) + : this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion, projectCollection, loadSettings) { } diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs index 01a6620714..21df964a75 100644 --- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs +++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs @@ -49,15 +49,15 @@ namespace Microsoft.Build.Evaluation { public class ProjectCollection : IDisposable { - public delegate void ProjectAddedEventHandler (object target, ProjectAddedToProjectCollectionEventArgs args); + public delegate void ProjectAddedEventHandler (object sender, ProjectAddedToProjectCollectionEventArgs e); public class ProjectAddedToProjectCollectionEventArgs : EventArgs { - public ProjectAddedToProjectCollectionEventArgs (ProjectRootElement project) + public ProjectAddedToProjectCollectionEventArgs (ProjectRootElement element) { - if (project == null) + if (element == null) throw new ArgumentNullException ("project"); - ProjectRootElement = project; + ProjectRootElement = element; } public ProjectRootElement ProjectRootElement { get; private set; } @@ -98,8 +98,8 @@ namespace Microsoft.Build.Evaluation { } - public ProjectCollection (ToolsetDefinitionLocations toolsetDefinitionLocations) - : this (null, null, toolsetDefinitionLocations) + public ProjectCollection (ToolsetDefinitionLocations toolsetLocations) + : this (null, null, toolsetLocations) { } diff --git a/mcs/class/Microsoft.CSharp/Makefile b/mcs/class/Microsoft.CSharp/Makefile index ae919ca94f..e22eae3e17 100644 --- a/mcs/class/Microsoft.CSharp/Makefile +++ b/mcs/class/Microsoft.CSharp/Makefile @@ -4,8 +4,10 @@ include ../../build/rules.make LIBRARY = Microsoft.CSharp.dll -LIB_REFS = System.Core Mono.CSharp +LIB_REFS = System.Core System LIB_MCS_FLAGS = +RESX_RESOURCE_STRING = ../../../external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx + include ../../build/library.make diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs deleted file mode 100644 index c8d56872c9..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Binder.cs +++ /dev/null @@ -1,96 +0,0 @@ -// -// Binder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Linq.Expressions; -using System.Reflection; - -namespace Microsoft.CSharp.RuntimeBinder -{ - public static class Binder - { - public static CallSiteBinder BinaryOperation (CSharpBinderFlags flags, ExpressionType operation, Type context, IEnumerable argumentInfo) - { - return new CSharpBinaryOperationBinder (operation, flags, context, argumentInfo); - } - - public static CallSiteBinder Convert (CSharpBinderFlags flags, Type type, Type context) - { - return new CSharpConvertBinder (type, context, flags); - } - - public static CallSiteBinder GetIndex (CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - { - return new CSharpGetIndexBinder (context, argumentInfo); - } - - public static CallSiteBinder GetMember (CSharpBinderFlags flags, string name, Type context, IEnumerable argumentInfo) - { - return new CSharpGetMemberBinder (name, context, argumentInfo); - } - - public static CallSiteBinder Invoke (CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - { - return new CSharpInvokeBinder (flags, context, argumentInfo); - } - - public static CallSiteBinder InvokeConstructor (CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - { - // What are flags for here - return new CSharpInvokeConstructorBinder (context, argumentInfo); - } - - public static CallSiteBinder InvokeMember (CSharpBinderFlags flags, string name, IEnumerable typeArguments, Type context, IEnumerable argumentInfo) - { - return new CSharpInvokeMemberBinder (flags, name, context, typeArguments, argumentInfo); - } - - public static CallSiteBinder IsEvent (CSharpBinderFlags flags, string name, Type context) - { - return new CSharpIsEventBinder (name, context); - } - - public static CallSiteBinder SetIndex (CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - { - return new CSharpSetIndexBinder (flags, context, argumentInfo); - } - - public static CallSiteBinder SetMember (CSharpBinderFlags flags, string name, Type context, IEnumerable argumentInfo) - { - return new CSharpSetMemberBinder (flags, name, context, argumentInfo); - } - - public static CallSiteBinder UnaryOperation (CSharpBinderFlags flags, ExpressionType operation, Type context, IEnumerable argumentInfo) - { - return new CSharpUnaryOperationBinder (operation, flags, context, argumentInfo); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs deleted file mode 100644 index 2c54af2797..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs +++ /dev/null @@ -1,83 +0,0 @@ -// -// CSharpArgumentInfo.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - public sealed class CSharpArgumentInfo - { - readonly CSharpArgumentInfoFlags flags; - readonly string name; - - CSharpArgumentInfo (CSharpArgumentInfoFlags flags, string name) - { - this.flags = flags; - this.name = name; - } - - public static CSharpArgumentInfo Create (CSharpArgumentInfoFlags flags, string name) - { - return new CSharpArgumentInfo (flags, name); - } - - internal Compiler.Argument.AType ArgumentModifier { - get { - if ((flags & CSharpArgumentInfoFlags.IsRef) != 0) - return Compiler.Argument.AType.Ref; - - if ((flags & CSharpArgumentInfoFlags.IsOut) != 0) - return Compiler.Argument.AType.Out; - - return Compiler.Argument.AType.None; - } - } - - internal static CallInfo CreateCallInfo (IEnumerable argumentInfo, int skipCount) - { - var named = from arg in argumentInfo.Skip (skipCount) where arg.IsNamed select arg.name; - return new CallInfo (Math.Max (0, argumentInfo.Count () - skipCount), named); - } - - internal CSharpArgumentInfoFlags Flags { - get { return flags; } - } - - internal bool IsNamed { - get { return (flags & CSharpArgumentInfoFlags.NamedArgument) != 0; } - } - - internal string Name { - get { return name; } - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs deleted file mode 100644 index 9a9ea7ed65..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// CSharpArgumentInfoFlags.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; - -namespace Microsoft.CSharp.RuntimeBinder -{ - [Flags] - public enum CSharpArgumentInfoFlags - { - None = 0, - UseCompileTimeType = 1, - Constant = 2, - NamedArgument = 4, - IsRef = 8, - IsOut = 16, - IsStaticType = 32 - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs deleted file mode 100644 index 374eb0d961..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs +++ /dev/null @@ -1,160 +0,0 @@ -// -// CSharpBinaryOperationBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Runtime.CompilerServices; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpBinaryOperationBinder : BinaryOperationBinder - { - IList argumentInfo; - readonly CSharpBinderFlags flags; - readonly Type context; - - public CSharpBinaryOperationBinder (ExpressionType operation, CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - : base (operation) - { - this.argumentInfo = new ReadOnlyCollectionBuilder (argumentInfo); - if (this.argumentInfo.Count != 2) - throw new ArgumentException ("Binary operation requires 2 arguments"); - - this.flags = flags; - this.context = context; - } - - Compiler.Binary.Operator GetOperator (out bool isCompound) - { - isCompound = false; - switch (Operation) { - case ExpressionType.Add: - return Compiler.Binary.Operator.Addition; - case ExpressionType.AddAssign: - isCompound = true; - return Compiler.Binary.Operator.Addition; - case ExpressionType.And: - return (flags & CSharpBinderFlags.BinaryOperationLogical) != 0 ? - Compiler.Binary.Operator.LogicalAnd : Compiler.Binary.Operator.BitwiseAnd; - case ExpressionType.AndAssign: - isCompound = true; - return Compiler.Binary.Operator.BitwiseAnd; - case ExpressionType.Divide: - return Compiler.Binary.Operator.Division; - case ExpressionType.DivideAssign: - isCompound = true; - return Compiler.Binary.Operator.Division; - case ExpressionType.Equal: - return Compiler.Binary.Operator.Equality; - case ExpressionType.ExclusiveOr: - return Compiler.Binary.Operator.ExclusiveOr; - case ExpressionType.ExclusiveOrAssign: - isCompound = true; - return Compiler.Binary.Operator.ExclusiveOr; - case ExpressionType.GreaterThan: - return Compiler.Binary.Operator.GreaterThan; - case ExpressionType.GreaterThanOrEqual: - return Compiler.Binary.Operator.GreaterThanOrEqual; - case ExpressionType.LeftShift: - return Compiler.Binary.Operator.LeftShift; - case ExpressionType.LeftShiftAssign: - isCompound = true; - return Compiler.Binary.Operator.LeftShift; - case ExpressionType.LessThan: - return Compiler.Binary.Operator.LessThan; - case ExpressionType.LessThanOrEqual: - return Compiler.Binary.Operator.LessThanOrEqual; - case ExpressionType.Modulo: - return Compiler.Binary.Operator.Modulus; - case ExpressionType.ModuloAssign: - isCompound = true; - return Compiler.Binary.Operator.Modulus; - case ExpressionType.Multiply: - return Compiler.Binary.Operator.Multiply; - case ExpressionType.MultiplyAssign: - isCompound = true; - return Compiler.Binary.Operator.Multiply; - case ExpressionType.NotEqual: - return Compiler.Binary.Operator.Inequality; - case ExpressionType.Or: - return (flags & CSharpBinderFlags.BinaryOperationLogical) != 0 ? - Compiler.Binary.Operator.LogicalOr : Compiler.Binary.Operator.BitwiseOr; - case ExpressionType.OrAssign: - isCompound = true; - return Compiler.Binary.Operator.BitwiseOr; - case ExpressionType.OrElse: - return Compiler.Binary.Operator.LogicalOr; - case ExpressionType.RightShift: - return Compiler.Binary.Operator.RightShift; - case ExpressionType.RightShiftAssign: - isCompound = true; - return Compiler.Binary.Operator.RightShift; - case ExpressionType.Subtract: - return Compiler.Binary.Operator.Subtraction; - case ExpressionType.SubtractAssign: - isCompound = true; - return Compiler.Binary.Operator.Subtraction; - default: - throw new NotImplementedException (Operation.ToString ()); - } - } - - public override DynamicMetaObject FallbackBinaryOperation (DynamicMetaObject target, DynamicMetaObject arg, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var left = ctx.CreateCompilerExpression (argumentInfo [0], target); - var right = ctx.CreateCompilerExpression (argumentInfo [1], arg); - - bool is_compound; - var oper = GetOperator (out is_compound); - Compiler.Expression expr; - - if (is_compound) { - var target_expr = new Compiler.RuntimeValueExpression (target, ctx.ImportType (target.LimitType)); - expr = new Compiler.CompoundAssign (oper, target_expr, right, left); - } else { - expr = new Compiler.Binary (oper, left, right); - } - - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - if ((flags & CSharpBinderFlags.CheckedContext) != 0) - expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (arg); - - return binder.Bind (ctx, context); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs deleted file mode 100644 index ab977fcffc..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs +++ /dev/null @@ -1,128 +0,0 @@ -// -// CSharpBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Linq.Expressions; -using Compiler = Mono.CSharp; -using System.Reflection; -using System.Collections.Generic; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpBinder - { - static ConstructorInfo binder_exception_ctor; - static object resolver = new object (); - - DynamicMetaObjectBinder binder; - Compiler.Expression expr; - BindingRestrictions restrictions; - DynamicMetaObject errorSuggestion; - - public CSharpBinder (DynamicMetaObjectBinder binder, Compiler.Expression expr, DynamicMetaObject errorSuggestion) - { - this.binder = binder; - this.expr = expr; - this.restrictions = BindingRestrictions.Empty; - this.errorSuggestion = errorSuggestion; - } - - public Compiler.ResolveContext.Options ResolveOptions { get; set; } - - public void AddRestrictions (DynamicMetaObject arg) - { - restrictions = restrictions.Merge (CreateRestrictionsOnTarget (arg)); - } - - public void AddRestrictions (DynamicMetaObject[] args) - { - restrictions = restrictions.Merge (CreateRestrictionsOnTarget (args)); - } - - public DynamicMetaObject Bind (DynamicContext ctx, Type callingType) - { - Expression res; - try { - var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, callingType), ResolveOptions); - - // Static typemanager and internal caches are not thread-safe - lock (resolver) { - expr = expr.Resolve (rc, Compiler.ResolveFlags.VariableOrValue); - } - - if (expr == null) - throw new RuntimeBinderInternalCompilerException ("Expression resolved to null"); - - res = expr.MakeExpression (new Compiler.BuilderContext ()); - } catch (RuntimeBinderException e) { - if (errorSuggestion != null) - return errorSuggestion; - - res = CreateBinderException (e.Message); - } catch (Exception) { - if (errorSuggestion != null) - return errorSuggestion; - - throw; - } - - return new DynamicMetaObject (res, restrictions); - } - - Expression CreateBinderException (string message) - { - if (binder_exception_ctor == null) - binder_exception_ctor = typeof (RuntimeBinderException).GetConstructor (new[] { typeof (string) }); - - // - // Uses target type to keep expressions composition working - // - return Expression.Throw (Expression.New (binder_exception_ctor, Expression.Constant (message)), binder.ReturnType); - } - - static BindingRestrictions CreateRestrictionsOnTarget (DynamicMetaObject arg) - { - return arg.HasValue && arg.Value == null ? - BindingRestrictions.GetInstanceRestriction (arg.Expression, null) : - BindingRestrictions.GetTypeRestriction (arg.Expression, arg.LimitType); - } - - public static BindingRestrictions CreateRestrictionsOnTarget (DynamicMetaObject[] args) - { - if (args.Length == 0) - return BindingRestrictions.Empty; - - var res = CreateRestrictionsOnTarget (args[0]); - for (int i = 1; i < args.Length; ++i) - res = res.Merge (CreateRestrictionsOnTarget (args[i])); - - return res; - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs deleted file mode 100644 index 39ef67948c..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// CSharpBinderFlags.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; - -namespace Microsoft.CSharp.RuntimeBinder -{ - [Flags] - public enum CSharpBinderFlags - { - None = 0, - CheckedContext = 1, - InvokeSimpleName = 1 << 1, - InvokeSpecialName = 1 << 2, - BinaryOperationLogical = 1 << 3, - ConvertExplicit = 1 << 4, - ConvertArrayIndex = 1 << 5, - ResultIndexed = 1 << 6, - ValueFromCompoundAssignment = 1 << 7, - ResultDiscarded = 1 << 8 - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs deleted file mode 100644 index 32fa4726b1..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs +++ /dev/null @@ -1,68 +0,0 @@ -// -// CSharpConvertBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpConvertBinder : ConvertBinder - { - readonly CSharpBinderFlags flags; - readonly Type context; - - public CSharpConvertBinder (Type type, Type context, CSharpBinderFlags flags) - : base (type, (flags & CSharpBinderFlags.ConvertExplicit) != 0) - { - this.flags = flags; - this.context = context; - } - - public override DynamicMetaObject FallbackConvert (DynamicMetaObject target, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var expr = ctx.CreateCompilerExpression (null, target); - - if (Explicit) - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (Type), Compiler.Location.Null), expr, Compiler.Location.Null); - else - expr = new Compiler.ImplicitCast (expr, ctx.ImportType (Type), (flags & CSharpBinderFlags.ConvertArrayIndex) != 0); - - if ((flags & CSharpBinderFlags.CheckedContext) != 0) - expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - - return binder.Bind (ctx, context); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs deleted file mode 100644 index 367cc22b70..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs +++ /dev/null @@ -1,71 +0,0 @@ -// -// CSharpGetIndexBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpGetIndexBinder : GetIndexBinder - { - IList argumentInfo; - Type callingContext; - - public CSharpGetIndexBinder (Type callingContext, IEnumerable argumentInfo) - : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1)) - { - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject FallbackGetIndex (DynamicMetaObject target, DynamicMetaObject[] indexes, DynamicMetaObject errorSuggestion) - { - if (argumentInfo.Count != indexes.Length + 1) { - if (errorSuggestion == null) - throw new NotImplementedException (); - - return errorSuggestion; - } - - var ctx = DynamicContext.Create (); - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - var args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), indexes); - expr = new Compiler.ElementAccess (expr, args, Compiler.Location.Null); - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (indexes); - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs deleted file mode 100644 index 790ed72f08..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs +++ /dev/null @@ -1,63 +0,0 @@ -// -// CSharpGetMemberBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpGetMemberBinder : GetMemberBinder - { - IList argumentInfo; - Type callingContext; - - public CSharpGetMemberBinder (string name, Type callingContext, IEnumerable argumentInfo) - : base (name, false) - { - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject FallbackGetMember (DynamicMetaObject target, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - expr = new Compiler.MemberAccess (expr, Name); - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs deleted file mode 100644 index 1f6b34a070..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs +++ /dev/null @@ -1,70 +0,0 @@ -// -// CSharpInvokeBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpInvokeBinder : InvokeBinder - { - readonly CSharpBinderFlags flags; - IList argumentInfo; - Type callingContext; - - public CSharpInvokeBinder (CSharpBinderFlags flags, Type callingContext, IEnumerable argumentInfo) - : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1)) - { - this.flags = flags; - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject FallbackInvoke (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args); - expr = new Compiler.Invocation (expr, c_args); - - if ((flags & CSharpBinderFlags.ResultDiscarded) == 0) - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - else - expr = new Compiler.DynamicResultCast (ctx.ImportType (ReturnType), expr); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (args); - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs deleted file mode 100644 index b5f0b9f263..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs +++ /dev/null @@ -1,73 +0,0 @@ -// -// CSharpInvokeConstructorBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpInvokeConstructorBinder : DynamicMetaObjectBinder - { - IList argumentInfo; - Type callingContext; - Type target_return_type; - - public CSharpInvokeConstructorBinder (Type callingContext, IEnumerable argumentInfo) - { - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args) - { - var ctx = DynamicContext.Create (); - - var type = ctx.CreateCompilerExpression (argumentInfo [0], target); - target_return_type = type.Type.GetMetaInfo (); - - var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args); - - var binder = new CSharpBinder ( - this, new Compiler.New (type, c_args, Compiler.Location.Null), null); - - binder.AddRestrictions (target); - binder.AddRestrictions (args); - - return binder.Bind (ctx, callingContext); - } - - public override Type ReturnType { - get { - return target_return_type; - } - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs deleted file mode 100644 index 138e31416b..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs +++ /dev/null @@ -1,194 +0,0 @@ -// -// CSharpInvokeMemberBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; -using SLE = System.Linq.Expressions; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpInvokeMemberBinder : InvokeMemberBinder - { - // - // A custom runtime invocation is needed to deal with member invocation which - // is not real member invocation but invocation on invocalble member. - // - // An example: - // class C { - // dynamic f; - // void Foo () - // { - // dynamic d = new C (); - // d.f.M (); - // } - // - // The runtime value of `f' can be a delegate in which case we are invoking result - // of member invocation, this is already handled by DoResolveDynamic but we need - // more runtime dependencies which require Microsoft.CSharp assembly reference or - // a lot of reflection calls - // - class Invocation : Compiler.Invocation - { - sealed class RuntimeDynamicInvocation : Compiler.ShimExpression - { - Invocation invoke; - - public RuntimeDynamicInvocation (Invocation invoke, Compiler.Expression memberExpr) - : base (memberExpr) - { - this.invoke = invoke; - } - - protected override Compiler.Expression DoResolve (Compiler.ResolveContext rc) - { - type = expr.Type; - eclass = Compiler.ExprClass.Value; - return this; - } - - // - // Creates an invoke call on invocable expression - // - public override System.Linq.Expressions.Expression MakeExpression (Compiler.BuilderContext ctx) - { - var invokeBinder = invoke.invokeBinder; - var binder = Binder.Invoke (invokeBinder.flags, invokeBinder.callingContext, invokeBinder.argumentInfo); - - var args = invoke.Arguments; - var args_expr = new SLE.Expression[invokeBinder.argumentInfo.Count]; - - var types = new Type [args_expr.Length + 2]; - - // Required by MakeDynamic - types[0] = typeof (System.Runtime.CompilerServices.CallSite); - types[1] = expr.Type.GetMetaInfo (); - - args_expr[0] = expr.MakeExpression (ctx); - - for (int i = 0; i < args.Count; ++i) { - args_expr[i + 1] = args[i].Expr.MakeExpression (ctx); - - int type_index = i + 2; - types[type_index] = args[i].Type.GetMetaInfo (); - if (args[i].IsByRef) - types[type_index] = types[type_index].MakeByRefType (); - } - - // Return type goes last - bool void_result = (invokeBinder.flags & CSharpBinderFlags.ResultDiscarded) != 0; - types[types.Length - 1] = void_result ? typeof (void) : invokeBinder.ReturnType; - - // - // Much easier to use Expression.Dynamic cannot be used because it ignores ByRef arguments - // and it always generates either Func or Action and any value type argument is lost - // - Type delegateType = SLE.Expression.GetDelegateType (types); - return SLE.Expression.MakeDynamic (delegateType, binder, args_expr); - } - } - - readonly CSharpInvokeMemberBinder invokeBinder; - - public Invocation (Compiler.Expression expr, Compiler.Arguments arguments, CSharpInvokeMemberBinder invokeBinder) - : base (expr, arguments) - { - this.invokeBinder = invokeBinder; - } - - protected override Compiler.Expression DoResolveDynamic (Compiler.ResolveContext ec, Compiler.Expression memberExpr) - { - return new RuntimeDynamicInvocation (this, memberExpr).Resolve (ec); - } - } - - readonly CSharpBinderFlags flags; - IList argumentInfo; - IList typeArguments; - Type callingContext; - - public CSharpInvokeMemberBinder (CSharpBinderFlags flags, string name, Type callingContext, IEnumerable typeArguments, IEnumerable argumentInfo) - : base (name, false, CSharpArgumentInfo.CreateCallInfo (argumentInfo, 1)) - { - this.flags = flags; - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - this.typeArguments = typeArguments.ToReadOnly (); - } - - public override DynamicMetaObject FallbackInvoke (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion) - { - var b = new CSharpInvokeBinder (flags, callingContext, argumentInfo); - - // TODO: Is errorSuggestion ever used? - return b.Defer (target, args); - } - - public override DynamicMetaObject FallbackInvokeMember (DynamicMetaObject target, DynamicMetaObject[] args, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var c_args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), args); - var t_args = typeArguments == null ? - null : - new Compiler.TypeArguments (typeArguments.Select (l => new Compiler.TypeExpression (ctx.ImportType (l), Compiler.Location.Null)).ToArray ()); - - var expr = ctx.CreateCompilerExpression (argumentInfo[0], target); - - // - // Simple name invocation is actually member access invocation - // to capture original this argument. This brings problem when - // simple name is resolved as a static invocation and member access - // has to be reduced back to simple name without reporting an error - // - if ((flags & CSharpBinderFlags.InvokeSimpleName) != 0) { - var value = expr as Compiler.RuntimeValueExpression; - if (value != null) - value.IsSuggestionOnly = true; - } - - expr = new Compiler.MemberAccess (expr, Name, t_args, Compiler.Location.Null); - expr = new Invocation (expr, c_args, this); - - if ((flags & CSharpBinderFlags.ResultDiscarded) == 0) - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - else - expr = new Compiler.DynamicResultCast (ctx.ImportType (ReturnType), expr); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (args); - - if ((flags & CSharpBinderFlags.InvokeSpecialName) != 0) - binder.ResolveOptions |= Compiler.ResolveContext.Options.InvokeSpecialName; - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs deleted file mode 100644 index e485e40ba1..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs +++ /dev/null @@ -1,71 +0,0 @@ -// -// CSharpIsEventBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpIsEventBinder : DynamicMetaObjectBinder - { - Type callingContext; - string name; - - public CSharpIsEventBinder (string name, Type callingContext) - { - this.name = name; - this.callingContext = callingContext; - } - - public override DynamicMetaObject Bind (DynamicMetaObject target, DynamicMetaObject[] args) - { - var ctx = DynamicContext.Create (); - var context_type = ctx.ImportType (callingContext); - var queried_type = ctx.ImportType (target.LimitType); - var rc = new Compiler.ResolveContext (new RuntimeBinderContext (ctx, context_type), 0); - - var expr = Compiler.Expression.MemberLookup (rc, false, queried_type, - name, 0, Compiler.Expression.MemberLookupRestrictions.ExactArity, Compiler.Location.Null); - - var binder = new CSharpBinder ( - this, new Compiler.BoolConstant (ctx.CompilerContext.BuiltinTypes, expr is Compiler.EventExpr, Compiler.Location.Null), null); - - binder.AddRestrictions (target); - return binder.Bind (ctx, callingContext); - } - - public override Type ReturnType { - get { - return typeof (bool); - } - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs deleted file mode 100644 index ad2f51a1db..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs +++ /dev/null @@ -1,86 +0,0 @@ -// -// CSharpSetIndexBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpSetIndexBinder : SetIndexBinder - { - readonly CSharpBinderFlags flags; - IList argumentInfo; - Type callingContext; - - public CSharpSetIndexBinder (CSharpBinderFlags flags, Type callingContext, IEnumerable argumentInfo) - : base (CSharpArgumentInfo.CreateCallInfo (argumentInfo, 2)) - { - this.flags = flags; - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject FallbackSetIndex (DynamicMetaObject target, DynamicMetaObject[] indexes, DynamicMetaObject value, DynamicMetaObject errorSuggestion) - { - if (argumentInfo.Count != indexes.Length + 2) { - if (errorSuggestion == null) - throw new NotImplementedException (); - - return errorSuggestion; - } - - var ctx = DynamicContext.Create (); - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - var args = ctx.CreateCompilerArguments (argumentInfo.Skip (1), indexes); - expr = new Compiler.ElementAccess (expr, args, Compiler.Location.Null); - - var source = ctx.CreateCompilerExpression (argumentInfo [indexes.Length + 1], value); - - // Same conversion as in SetMemberBinder - if ((flags & CSharpBinderFlags.ValueFromCompoundAssignment) != 0) { - expr = new Compiler.RuntimeExplicitAssign (expr, source); - } else { - expr = new Compiler.SimpleAssign (expr, source); - } - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - if ((flags & CSharpBinderFlags.CheckedContext) != 0) - expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (value); - binder.AddRestrictions (indexes); - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs deleted file mode 100644 index aaf2b251c5..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs +++ /dev/null @@ -1,82 +0,0 @@ -// -// CSharpSetMemberBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpSetMemberBinder : SetMemberBinder - { - readonly CSharpBinderFlags flags; - IList argumentInfo; - Type callingContext; - - public CSharpSetMemberBinder (CSharpBinderFlags flags, string name, Type callingContext, IEnumerable argumentInfo) - : base (name, false) - { - this.flags = flags; - this.callingContext = callingContext; - this.argumentInfo = argumentInfo.ToReadOnly (); - } - - public override DynamicMetaObject FallbackSetMember (DynamicMetaObject target, DynamicMetaObject value, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var source = ctx.CreateCompilerExpression (argumentInfo [1], value); - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - - // Field assignment - expr = new Compiler.MemberAccess (expr, Name); - - // Compound assignment under dynamic context does not convert result - // expression but when setting member type we need to do explicit - // conversion to ensure type match between member type and dynamic - // expression type - if ((flags & CSharpBinderFlags.ValueFromCompoundAssignment) != 0) { - expr = new Compiler.RuntimeExplicitAssign (expr, source); - } else { - expr = new Compiler.SimpleAssign (expr, source); - } - - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - if ((flags & CSharpBinderFlags.CheckedContext) != 0) - expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null); - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - binder.AddRestrictions (value); - - return binder.Bind (ctx, callingContext); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs deleted file mode 100644 index f625f5f218..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs +++ /dev/null @@ -1,101 +0,0 @@ -// -// CSharpUnaryOperationBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class CSharpUnaryOperationBinder : UnaryOperationBinder - { - IList argumentInfo; - readonly CSharpBinderFlags flags; - readonly Type context; - - public CSharpUnaryOperationBinder (ExpressionType operation, CSharpBinderFlags flags, Type context, IEnumerable argumentInfo) - : base (operation) - { - this.argumentInfo = argumentInfo.ToReadOnly (); - if (this.argumentInfo.Count != 1) - throw new ArgumentException ("Unary operation requires 1 argument"); - - this.flags = flags; - this.context = context; - } - - - Compiler.Unary.Operator GetOperator () - { - switch (Operation) { - case ExpressionType.Negate: - return Compiler.Unary.Operator.UnaryNegation; - case ExpressionType.Not: - return Compiler.Unary.Operator.LogicalNot; - case ExpressionType.OnesComplement: - return Compiler.Unary.Operator.OnesComplement; - case ExpressionType.UnaryPlus: - return Compiler.Unary.Operator.UnaryPlus; - default: - throw new NotImplementedException (Operation.ToString ()); - } - } - - public override DynamicMetaObject FallbackUnaryOperation (DynamicMetaObject target, DynamicMetaObject errorSuggestion) - { - var ctx = DynamicContext.Create (); - var expr = ctx.CreateCompilerExpression (argumentInfo [0], target); - - if (Operation == ExpressionType.IsTrue) { - expr = new Compiler.BooleanExpression (expr); - } else if (Operation == ExpressionType.IsFalse) { - expr = new Compiler.BooleanExpressionFalse (expr); - } else { - if (Operation == ExpressionType.Increment) - expr = new Compiler.UnaryMutator (Compiler.UnaryMutator.Mode.PreIncrement, expr, Compiler.Location.Null); - else if (Operation == ExpressionType.Decrement) - expr = new Compiler.UnaryMutator (Compiler.UnaryMutator.Mode.PreDecrement, expr, Compiler.Location.Null); - else - expr = new Compiler.Unary (GetOperator (), expr, Compiler.Location.Null); - - expr = new Compiler.Cast (new Compiler.TypeExpression (ctx.ImportType (ReturnType), Compiler.Location.Null), expr, Compiler.Location.Null); - - if ((flags & CSharpBinderFlags.CheckedContext) != 0) - expr = new Compiler.CheckedExpr (expr, Compiler.Location.Null); - } - - var binder = new CSharpBinder (this, expr, errorSuggestion); - binder.AddRestrictions (target); - - return binder.Bind (ctx, context); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs deleted file mode 100644 index 9c466c5ed9..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs +++ /dev/null @@ -1,192 +0,0 @@ -// -// DynamicContext.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using Compiler = Mono.CSharp; -using System.Reflection; -using System.Collections.Generic; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class DynamicContext - { - static DynamicContext dc; - static object compiler_initializer = new object (); - static object lock_object = new object (); - - readonly Compiler.ModuleContainer module; - readonly Compiler.ReflectionImporter importer; - - private DynamicContext (Compiler.ModuleContainer module, Compiler.ReflectionImporter importer) - { - this.module = module; - this.importer = importer; - } - - public Compiler.CompilerContext CompilerContext { - get { - return module.Compiler; - } - } - - public Compiler.ModuleContainer Module { - get { - return module; - } - } - - public static DynamicContext Create () - { - if (dc != null) - return dc; - - lock (compiler_initializer) { - if (dc != null) - return dc; - - var settings = new Compiler.CompilerSettings () { - WarningLevel = 0 - }; - - var cc = new Compiler.CompilerContext (settings, ErrorPrinter.Instance) { - IsRuntimeBinder = true - }; - - // - // Any later loaded assemblies are handled internally by GetAssemblyDefinition - // domain.AssemblyLoad cannot be used as that would be too destructive as we - // would hold all loaded assemblies even if they can be never visited - // - // TODO: Remove this code and rely on GetAssemblyDefinition only - // - var module = new Compiler.ModuleContainer (cc); - module.HasTypesFullyDefined = true; - - // Setup fake assembly, it's used mostly to simplify checks like friend-access - var temp = new Compiler.AssemblyDefinitionDynamic (module, "dynamic"); - module.SetDeclaringAssembly (temp); - - var importer = new Compiler.ReflectionImporter (module, cc.BuiltinTypes) { - IgnorePrivateMembers = false - }; - - // Import all currently loaded assemblies - // TODO: Rewrite this to populate type cache on-demand, that should greatly - // reduce our start-up cost - var domain = AppDomain.CurrentDomain; - foreach (var a in AppDomain.CurrentDomain.GetAssemblies ()) { - importer.ImportAssembly (a, module.GlobalRootNamespace); - } - - cc.BuiltinTypes.CheckDefinitions (module); - module.InitializePredefinedTypes (); - - dc = new DynamicContext (module, importer); - } - - return dc; - } - - // - // Creates mcs expression from dynamic object - // - public Compiler.Expression CreateCompilerExpression (CSharpArgumentInfo info, DynamicMetaObject value) - { - // - // No type details provider, go with runtime type - // - if (info == null) { - if (value.LimitType == typeof (object)) - return new Compiler.NullLiteral (Compiler.Location.Null); - - return new Compiler.RuntimeValueExpression (value, ImportType (value.RuntimeType)); - } - - // - // Value is known to be a type - // - if ((info.Flags & CSharpArgumentInfoFlags.IsStaticType) != 0) - return new Compiler.TypeExpression (ImportType ((Type) value.Value), Compiler.Location.Null); - - if (value.Value == null && - (info.Flags & (CSharpArgumentInfoFlags.IsOut | CSharpArgumentInfoFlags.IsRef | CSharpArgumentInfoFlags.UseCompileTimeType)) == 0 && - value.LimitType == typeof (object)) { - return new Compiler.NullLiteral (Compiler.Location.Null); - } - - // - // Use compilation time type when type was known not to be dynamic during compilation - // - Type value_type = (info.Flags & CSharpArgumentInfoFlags.UseCompileTimeType) != 0 ? value.Expression.Type : value.LimitType; - var type = ImportType (value_type); - - if ((info.Flags & CSharpArgumentInfoFlags.Constant) != 0) { - var c = Compiler.Constant.CreateConstantFromValue (type, value.Value, Compiler.Location.Null); - // - // It can be null for misused Constant flag - // - if (c != null) - return c; - } - - return new Compiler.RuntimeValueExpression (value, type); - } - - // - // Creates mcs arguments from dynamic argument info - // - public Compiler.Arguments CreateCompilerArguments (IEnumerable info, DynamicMetaObject[] args) - { - var res = new Compiler.Arguments (args.Length); - int pos = 0; - - // enumerates over args - foreach (var item in info) { - var expr = CreateCompilerExpression (item, args[pos++]); - if (item.IsNamed) { - res.Add (new Compiler.NamedArgument (item.Name, Compiler.Location.Null, expr, item.ArgumentModifier)); - } else { - res.Add (new Compiler.Argument (expr, item.ArgumentModifier)); - } - - if (pos == args.Length) - break; - } - - return res; - } - - public Compiler.TypeSpec ImportType (Type type) - { - lock (lock_object) { - return importer.ImportType (type); - } - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs deleted file mode 100644 index 874953a50d..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs +++ /dev/null @@ -1,60 +0,0 @@ -// -// ErrorPrinter.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - class ErrorPrinter : Compiler.ReportPrinter - { - public static readonly ErrorPrinter Instance = new ErrorPrinter (); - - private ErrorPrinter () - { - } - - public override bool HasRelatedSymbolSupport { - get { - return false; - } - } - - public override void Print (Compiler.AbstractMessage msg, bool showFullPath) - { - string text; - if (msg.Code == 214) { - text = "Pointers and fixed size buffers cannot be used in a dynamic context"; - } else { - text = msg.Text; - } - - throw new RuntimeBinderException (text); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs deleted file mode 100644 index 9a55598f39..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/Extensions.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -// CSharpInvokeMemberBinder.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Dynamic; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.CompilerServices; - -namespace Microsoft.CSharp.RuntimeBinder -{ - static class Extensions - { - public static IList ToReadOnly (this IEnumerable col) - { - return col == null ? - null : new ReadOnlyCollectionBuilder (col); - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs deleted file mode 100644 index e2b38dbfcd..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs +++ /dev/null @@ -1,133 +0,0 @@ -// -// RuntimeBinderContext.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections.Generic; -using Compiler = Mono.CSharp; - -namespace Microsoft.CSharp.RuntimeBinder -{ - sealed class RuntimeBinderContext : Compiler.IMemberContext - { - readonly Compiler.ModuleContainer module; - readonly Type callingType; - readonly DynamicContext ctx; - Compiler.TypeSpec callingTypeImported; - - public RuntimeBinderContext (DynamicContext ctx, Compiler.TypeSpec callingType) - { - this.ctx = ctx; - this.module = ctx.Module; - this.callingTypeImported = callingType; - } - - public RuntimeBinderContext (DynamicContext ctx, Type callingType) - { - this.ctx = ctx; - this.module = ctx.Module; - this.callingType = callingType; - } - - #region IMemberContext Members - - public Compiler.TypeSpec CurrentType { - get { - // - // Delay importing of calling type to be compatible with .net - // Some libraries are setting it to null which is invalid - // but the NullReferenceException is thrown only when the context - // is used and not during initialization - // - if (callingTypeImported == null && callingType != null) - callingTypeImported = ctx.ImportType (callingType); - - return callingTypeImported; - } - } - - public Compiler.TypeParameters CurrentTypeParameters { - get { throw new NotImplementedException (); } - } - - public Compiler.MemberCore CurrentMemberDefinition { - get { - return null; - } - } - - public bool IsObsolete { - get { - // Always true to ignore obsolete attribute checks - return true; - } - } - - public bool IsUnsafe { - get { - // Dynamic cannot be used with pointers - return false; - } - } - - public bool IsStatic { - get { - throw new NotImplementedException (); - } - } - - public Compiler.ModuleContainer Module { - get { - return module; - } - } - - public string GetSignatureForError () - { - throw new NotImplementedException (); - } - - public Compiler.ExtensionMethodCandidates LookupExtensionMethod (string name, int arity) - { - // No extension method lookup in this context - return null; - } - - public Compiler.FullNamedExpression LookupNamespaceOrType (string name, int arity, Mono.CSharp.LookupMode mode, Mono.CSharp.Location loc) - { - throw new NotImplementedException (); - } - - public Compiler.FullNamedExpression LookupNamespaceAlias (string name) - { - // No namespace aliases in this context - return null; - } - - #endregion - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs deleted file mode 100644 index f30f77ad6c..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -// RuntimeBinderException.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Runtime.Serialization; - -namespace Microsoft.CSharp.RuntimeBinder -{ - [Serializable] - public class RuntimeBinderException : Exception - { - public RuntimeBinderException () - { - } - - public RuntimeBinderException (string message) - : base (message) - { - } - - public RuntimeBinderException (string message, Exception innerException) - : base (message, innerException) - { - } - - protected RuntimeBinderException (SerializationInfo info, StreamingContext context) - : base (info, context) - { - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs deleted file mode 100644 index 83e3cc2d36..0000000000 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -// RuntimeBinderInternalCompilerException.cs -// -// Authors: -// Marek Safar -// -// Copyright (C) 2009 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Runtime.Serialization; - -namespace Microsoft.CSharp.RuntimeBinder -{ - [Serializable] - public class RuntimeBinderInternalCompilerException : Exception - { - public RuntimeBinderInternalCompilerException () - { - } - - public RuntimeBinderInternalCompilerException (string message) - : base (message) - { - } - - public RuntimeBinderInternalCompilerException (string message, Exception innerException) - : base (message, innerException) - { - } - - protected RuntimeBinderInternalCompilerException (SerializationInfo info, StreamingContext context) - : base (info, context) - { - } - } -} diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources index 3d6d20b5e7..96568b4708 100644 --- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources +++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources @@ -1,23 +1,197 @@ Assembly/AssemblyInfo.cs -Microsoft.CSharp.RuntimeBinder/Binder.cs -Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.cs -Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfoFlags.cs -Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpBinderFlags.cs -Microsoft.CSharp.RuntimeBinder/CSharpConvertBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpGetIndexBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpGetMemberBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpInvokeBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpInvokeConstructorBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpInvokeMemberBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpIsEventBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpSetIndexBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpSetMemberBinder.cs -Microsoft.CSharp.RuntimeBinder/CSharpUnaryOperationBinder.cs -Microsoft.CSharp.RuntimeBinder/DynamicContext.cs -Microsoft.CSharp.RuntimeBinder/Extensions.cs -Microsoft.CSharp.RuntimeBinder/RuntimeBinderContext.cs -Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.cs -Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.cs -Microsoft.CSharp.RuntimeBinder/CSharpBinder.cs -Microsoft.CSharp.RuntimeBinder/ErrorPrinter.cs +../../build/common/SR.cs +../../build/common/Consts.cs + +corefx/SR.cs + +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Binder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpArgumentInfo.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpArgumentInfoFlags.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinaryOperationFlags.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpBinderFlags.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpCallFlags.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConversionKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpConvertBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetIndexBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpGetMemberBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeConstructorBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpInvokeMemberBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpIsEventBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetIndexBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpSetMemberBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/CSharpUnaryOperationBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Error.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CController.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CError.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CErrorFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/CParameterizedError.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorCode.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFacts.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorFmt.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/ErrorHandling.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/IErrorSink.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/MessageID.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Errors/UserStringBuilder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ExpressionTreeCallRewriter.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ICSharpInvokeOrInvokeMemberBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ResetBindException.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderController.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderInternalCompilerException.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/Better.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Binding/ErrorReporting.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContextBase.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingContexts.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BindingFlag.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpArgInfo.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/BinOpSig.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/CandidateFunctionMember.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ConstVal.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ConstValFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversion.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/COperators.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/Declaration.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/GlobalAttributeDeclaration.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/NamespaceDeclaration.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRFLAG.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FileRecord.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FundamentalTypes.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/InputFile.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ITypeOrNamespace.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/LangCompiler.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MetadataToken.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodIterator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MethodTypeInferrer.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/NameGenerator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Nullable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/NullableLift.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Operators.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/OriginalExpressions.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedAttributes.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/PredefinedMembers.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SemanticChecker.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/SubstitutionContext.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AggregateSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/AssemblyQualifiedNamespaceSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/EventSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/IndexerSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LabelSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LocalVariableSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodOrPropertySymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MiscSymFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceOrAggregateSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/NamespaceSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/ParentSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/PropertySymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Scope.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolLoader.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolManagerBase.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolMask.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactoryBase.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TransparentIdentifierMemberSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TypeParameterSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/UnresolvedAggregateSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/VariableSymbol.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayIndex.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayInitialization.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayLength.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Assignment.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BinaryOperator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Block.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BoundAnonymousFunction.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Call.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Cast.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Class.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/CompoundOperator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ConditionalOperator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Event.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ExpressionIterator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Field.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/FieldInfo.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/HoistedLocal.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/List.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/LocalVariable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MemberGroup.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodInfo.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/MethodReference.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/NamedArgumentSpecification.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Property.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/PropertyInfo.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Return.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Statement.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Temporary.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/This.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeArguments.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOrNamespace.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnaryOperator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnboundAnonymousFunction.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedConversion.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedLogicalOperator.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExprVisitorBase.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ZeroInitialize.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/TypeBind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/AggregateType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArgumentListType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ArrayType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/BoundLambdaType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ErrorType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/MethodGroupType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullableType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/NullType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/OpenTypePlaceholderType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/ParameterModifierType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PointerType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/PredefinedTypes.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/Type.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeArray.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeFactory.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeKind.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeManager.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeParameterType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/TypeTable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Types/VoidType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UnaOpSig.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/UtilityTypeExtensions.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/WithType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SpecialNames.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/KnownName.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameManager.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Names.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/NameTable.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/Operators.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedName.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/PredefinedType.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenFacts.cs +../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Syntax/TokenKind.cs diff --git a/mcs/class/Microsoft.CSharp/corefx/SR.cs b/mcs/class/Microsoft.CSharp/corefx/SR.cs new file mode 100644 index 0000000000..c4b854bfd8 --- /dev/null +++ b/mcs/class/Microsoft.CSharp/corefx/SR.cs @@ -0,0 +1,134 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string InternalCompilerError = "An unexpected exception occurred while binding a dynamic operation"; + public const string BindRequireArguments = "Cannot bind call with no calling object"; + public const string BindCallFailedOverloadResolution = "Overload resolution failed"; + public const string BindBinaryOperatorRequireTwoArguments = "Binary operators must be invoked with two arguments"; + public const string BindUnaryOperatorRequireOneArgument = "Unary operators must be invoked with one argument"; + public const string BindPropertyFailedMethodGroup = "The name '{0}' is bound to a method and cannot be used like a property"; + public const string BindPropertyFailedEvent = "The event '{0}' can only appear on the left hand side of +"; + public const string BindInvokeFailedNonDelegate = "Cannot invoke a non-delegate type"; + public const string BindImplicitConversionRequireOneArgument = "Implicit conversion takes exactly one argument"; + public const string BindExplicitConversionRequireOneArgument = "Explicit conversion takes exactly one argument"; + public const string BindBinaryAssignmentRequireTwoArguments = "Binary operators cannot be invoked with one argument"; + public const string BindBinaryAssignmentFailedNullReference = "Cannot perform member assignment on a null reference"; + public const string NullReferenceOnMemberException = "Cannot perform runtime binding on a null reference"; + public const string BindCallToConditionalMethod = "Cannot dynamically invoke method '{0}' because it has a Conditional attribute"; + public const string BindToVoidMethodButExpectResult = "Cannot implicitly convert type 'void' to 'object'"; + public const string BadBinaryOps = "Operator '{0}' cannot be applied to operands of type '{1}' and '{2}'"; + public const string IntDivByZero = "Division by constant zero"; + public const string BadIndexLHS = "Cannot apply indexing with [] to an expression of type '{0}'"; + public const string BadIndexCount = "Wrong number of indices inside []; expected '{0}'"; + public const string BadUnaryOp = "Operator '{0}' cannot be applied to operand of type '{1}'"; + public const string NoImplicitConv = "Cannot implicitly convert type '{0}' to '{1}'"; + public const string NoExplicitConv = "Cannot convert type '{0}' to '{1}'"; + public const string ConstOutOfRange = "Constant value '{0}' cannot be converted to a '{1}'"; + public const string AmbigBinaryOps = "Operator '{0}' is ambiguous on operands of type '{1}' and '{2}'"; + public const string AmbigUnaryOp = "Operator '{0}' is ambiguous on an operand of type '{1}'"; + public const string ValueCantBeNull = "Cannot convert null to '{0}' because it is a non-nullable value type"; + public const string WrongNestedThis = "Cannot access a non-static member of outer type '{0}' via nested type '{1}'"; + public const string NoSuchMember = "'{0}' does not contain a definition for '{1}'"; + public const string ObjectRequired = "An object reference is required for the non-static field, method, or property '{0}'"; + public const string AmbigCall = "The call is ambiguous between the following methods or properties: '{0}' and '{1}'"; + public const string BadAccess = "'{0}' is inaccessible due to its protection level"; + public const string MethDelegateMismatch = "No overload for '{0}' matches delegate '{1}'"; + public const string AssgLvalueExpected = "The left-hand side of an assignment must be a variable, property or indexer"; + public const string NoConstructors = "The type '{0}' has no constructors defined"; + public const string BadDelegateConstructor = "The delegate '{0}' does not have a valid constructor"; + public const string PropertyLacksGet = "The property or indexer '{0}' cannot be used in this context because it lacks the get accessor"; + public const string ObjectProhibited = "Member '{0}' cannot be accessed with an instance reference; qualify it with a type name instead"; + public const string AssgReadonly = "A readonly field cannot be assigned to (except in a constructor or a variable initializer)"; + public const string RefReadonly = "A readonly field cannot be passed ref or out (except in a constructor)"; + public const string AssgReadonlyStatic = "A static readonly field cannot be assigned to (except in a static constructor or a variable initializer)"; + public const string RefReadonlyStatic = "A static readonly field cannot be passed ref or out (except in a static constructor)"; + public const string AssgReadonlyProp = "Property or indexer '{0}' cannot be assigned to -- it is read only"; + public const string AbstractBaseCall = "Cannot call an abstract base member: '{0}'"; + public const string RefProperty = "A property or indexer may not be passed as an out or ref parameter"; + public const string ManagedAddr = "Cannot take the address of, get the size of, or declare a pointer to a managed type ('{0}')"; + public const string FixedNotNeeded = "You cannot use the fixed statement to take the address of an already fixed expression"; + public const string UnsafeNeeded = "Dynamic calls cannot be used in conjunction with pointers"; + public const string BadBoolOp = "In order to be applicable as a short circuit operator a user-defined logical operator ('{0}') must have the same return type as the type of its 2 parameters"; + public const string MustHaveOpTF = "The type ('{0}') must contain declarations of operator true and operator false"; + public const string CheckedOverflow = "The operation overflows at compile time in checked mode"; + public const string ConstOutOfRangeChecked = "Constant value '{0}' cannot be converted to a '{1}' (use 'unchecked' syntax to override)"; + public const string AmbigMember = "Ambiguity between '{0}' and '{1}'"; + public const string SizeofUnsafe = "'{0}' does not have a predefined size, therefore sizeof can only be used in an unsafe context (consider using System.Runtime.InteropServices.Marshal.SizeOf)"; + public const string FieldInitRefNonstatic = "A field initializer cannot reference the non-static field, method, or property '{0}'"; + public const string CallingFinalizeDepracated = "Destructors and object.Finalize cannot be called directly. Consider calling IDisposable.Dispose if available."; + public const string CallingBaseFinalizeDeprecated = "Do not directly call your base class Finalize method. It is called automatically from your destructor."; + public const string BadCastInFixed = "The right hand side of a fixed statement assignment may not be a cast expression"; + public const string NoImplicitConvCast = "Cannot implicitly convert type '{0}' to '{1}'. An explicit conversion exists (are you missing a cast?)"; + public const string InaccessibleGetter = "The property or indexer '{0}' cannot be used in this context because the get accessor is inaccessible"; + public const string InaccessibleSetter = "The property or indexer '{0}' cannot be used in this context because the set accessor is inaccessible"; + public const string BadArity = "Using the generic {1} '{0}' requires '{2}' type arguments"; + public const string BadTypeArgument = "The type '{0}' may not be used as a type argument"; + public const string TypeArgsNotAllowed = "The {1} '{0}' cannot be used with type arguments"; + public const string HasNoTypeVars = "The non-generic {1} '{0}' cannot be used with type arguments"; + public const string NewConstraintNotSatisfied = "'{2}' must be a non-abstract type with a public parameterless constructor in order to use it as parameter '{1}' in the generic type or method '{0}'"; + public const string GenericConstraintNotSatisfiedRefType = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no implicit reference conversion from '{3}' to '{1}'."; + public const string GenericConstraintNotSatisfiedNullableEnum = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. The nullable type '{3}' does not satisfy the constraint of '{1}'."; + public const string GenericConstraintNotSatisfiedNullableInterface = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. The nullable type '{3}' does not satisfy the constraint of '{1}'. Nullable types can not satisfy any interface constraints."; + public const string GenericConstraintNotSatisfiedTyVar = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no boxing conversion or type parameter conversion from '{3}' to '{1}'."; + public const string GenericConstraintNotSatisfiedValType = "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no boxing conversion from '{3}' to '{1}'."; + public const string TypeVarCantBeNull = "Cannot convert null to type parameter '{0}' because it could be a non-nullable value type. Consider using 'default({0})' instead."; + public const string BadRetType = "'{1} {0}' has the wrong return type"; + public const string CantInferMethTypeArgs = "The type arguments for method '{0}' cannot be inferred from the usage. Try specifying the type arguments explicitly."; + public const string MethGrpToNonDel = "Cannot convert method group '{0}' to non-delegate type '{1}'. Did you intend to invoke the method?"; + public const string RefConstraintNotSatisfied = "The type '{2}' must be a reference type in order to use it as parameter '{1}' in the generic type or method '{0}'"; + public const string ValConstraintNotSatisfied = "The type '{2}' must be a non-nullable value type in order to use it as parameter '{1}' in the generic type or method '{0}'"; + public const string CircularConstraint = "Circular constraint dependency involving '{0}' and '{1}'"; + public const string BaseConstraintConflict = "Type parameter '{0}' inherits conflicting constraints '{1}' and '{2}'"; + public const string ConWithValCon = "Type parameter '{1}' has the 'struct' constraint so '{1}' cannot be used as a constraint for '{0}'"; + public const string AmbigUDConv = "Ambiguous user defined conversions '{0}' and '{1}' when converting from '{2}' to '{3}'"; + public const string PredefinedTypeNotFound = "Predefined type '{0}' is not defined or imported"; + public const string PredefinedTypeBadType = "Predefined type '{0}' is declared incorrectly"; + public const string BindToBogus = "'{0}' is not supported by the language"; + public const string CantCallSpecialMethod = "'{0}': cannot explicitly call operator or accessor"; + public const string BogusType = "'{0}' is a type not supported by the language"; + public const string MissingPredefinedMember = "Missing compiler required member '{0}.{1}'"; + public const string LiteralDoubleCast = "Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type"; + public const string UnifyingInterfaceInstantiations = "'{0}' cannot implement both '{1}' and '{2}' because they may unify for some type parameter substitutions"; + public const string ConvertToStaticClass = "Cannot convert to static type '{0}'"; + public const string GenericArgIsStaticClass = "'{0}': static types cannot be used as type arguments"; + public const string PartialMethodToDelegate = "Cannot create delegate from method '{0}' because it is a partial method without an implementing declaration"; + public const string IncrementLvalueExpected = "The operand of an increment or decrement operator must be a variable, property or indexer"; + public const string NoSuchMemberOrExtension = "'{0}' does not contain a definition for '{1}' and no extension method '{1}' accepting a first argument of type '{0}' could be found (are you missing a using directive or an assembly reference?)"; + public const string ValueTypeExtDelegate = "Extension methods '{0}' defined on value type '{1}' cannot be used to create delegates"; + public const string BadArgCount = "No overload for method '{0}' takes '{1}' arguments"; + public const string BadArgTypes = "The best overloaded method match for '{0}' has some invalid arguments"; + public const string BadArgType = "Argument '{0}': cannot convert from '{1}' to '{2}'"; + public const string RefLvalueExpected = "A ref or out argument must be an assignable variable"; + public const string BadProtectedAccess = "Cannot access protected member '{0}' via a qualifier of type '{1}'; the qualifier must be of type '{2}' (or derived from it)"; + public const string BindToBogusProp2 = "Property, indexer, or event '{0}' is not supported by the language; try directly calling accessor methods '{1}' or '{2}'"; + public const string BindToBogusProp1 = "Property, indexer, or event '{0}' is not supported by the language; try directly calling accessor method '{1}'"; + public const string BadDelArgCount = "Delegate '{0}' does not take '{1}' arguments"; + public const string BadDelArgTypes = "Delegate '{0}' has some invalid arguments"; + public const string AssgReadonlyLocal = "Cannot assign to '{0}' because it is read-only"; + public const string RefReadonlyLocal = "Cannot pass '{0}' as a ref or out argument because it is read-only"; + public const string ReturnNotLValue = "Cannot modify the return value of '{0}' because it is not a variable"; + public const string BadArgExtraRef = "Argument '{0}' should not be passed with the '{1}' keyword"; + public const string BadArgRef = "Argument '{0}' must be passed with the '{1}' keyword"; + public const string AssgReadonly2 = "Members of readonly field '{0}' cannot be modified (except in a constructor or a variable initializer)"; + public const string RefReadonly2 = "Members of readonly field '{0}' cannot be passed ref or out (except in a constructor)"; + public const string AssgReadonlyStatic2 = "Fields of static readonly field '{0}' cannot be assigned to (except in a static constructor or a variable initializer)"; + public const string RefReadonlyStatic2 = "Fields of static readonly field '{0}' cannot be passed ref or out (except in a static constructor)"; + public const string AssgReadonlyLocalCause = "Cannot assign to '{0}' because it is a '{1}'"; + public const string RefReadonlyLocalCause = "Cannot pass '{0}' as a ref or out argument because it is a '{1}'"; + public const string ThisStructNotInAnonMeth = "Anonymous methods, lambda expressions, and query expressions inside structs cannot access instance members of 'this'. Consider copying 'this' to a local variable outside the anonymous method, lambda expression or query expression and using the local instead."; + public const string DelegateOnNullable = "Cannot bind delegate to '{0}' because it is a member of 'System.Nullable'"; + public const string BadCtorArgCount = "'{0}' does not contain a constructor that takes '{1}' arguments"; + public const string BadExtensionArgTypes = "'{0}' does not contain a definition for '{1}' and the best extension method overload '{2}' has some invalid arguments"; + public const string BadInstanceArgType = "Instance argument: cannot convert from '{0}' to '{1}'"; + public const string BadArgTypesForCollectionAdd = "The best overloaded Add method '{0}' for the collection initializer has some invalid arguments"; + public const string InitializerAddHasParamModifiers = "The best overloaded method match '{0}' for the collection initializer element cannot be used. Collection initializer 'Add' methods cannot have ref or out parameters."; + public const string NonInvocableMemberCalled = "Non-invocable member '{0}' cannot be used like a method."; + public const string NamedArgumentSpecificationBeforeFixedArgument = "Named argument specifications must appear after all fixed arguments have been specified"; + public const string BadNamedArgument = "The best overload for '{0}' does not have a parameter named '{1}'"; + public const string BadNamedArgumentForDelegateInvoke = "The delegate '{0}' does not have a parameter named '{1}'"; + public const string DuplicateNamedArgument = "Named argument '{0}' cannot be specified multiple times"; + public const string NamedArgumentUsedInPositional = "Named argument '{0}' specifies a parameter for which a positional argument has already been given"; +} diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources index 0bbd93782b..2bd1a5a5f4 100644 --- a/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources @@ -1,3 +1,5 @@ +Assembly/AssemblyInfo.cs +aot.cs ../../mcs/anonymous.cs ../../mcs/argument.cs ../../mcs/assign.cs @@ -55,4 +57,3 @@ ../../build/common/Consts.cs ../../tools/monop/outline.cs ../../mcs/cs-parser.cs -Assembly/AssemblyInfo.cs diff --git a/mcs/class/Mono.CSharp/aot.cs b/mcs/class/Mono.CSharp/aot.cs new file mode 100644 index 0000000000..844d761ae6 --- /dev/null +++ b/mcs/class/Mono.CSharp/aot.cs @@ -0,0 +1,105 @@ +// +// aot.cs: AOT System.Reflection.Emit extensions to simplify mcs compilation +// +// Authors: +// Marek Safar +// +// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if FULL_AOT_RUNTIME + +namespace System.Reflection.Emit +{ + static class AssemblyBuilderExtensions + { + public static void AddResourceFile (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static ModuleBuilder DefineDynamicModule (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static void DefineVersionInfoResource (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static void DefineUnmanagedResource (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static void Save (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static void SetEntryPoint (this AssemblyBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + } + + static class ConstructorBuilderExtensions + { + public static void AddDeclarativeSecurity (this ConstructorBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + } + + static class MethodBuilderExtensions + { + public static void AddDeclarativeSecurity (this MethodBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + } + + static class ModuleBuilderExtensions + { + public static void DefineManifestResource (this ModuleBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + } + + static class TypeBuilderExtensions + { + public static void AddDeclarativeSecurity (this TypeBuilder builder, params object[] args) + { + throw new NotSupportedException (); + } + + public static Type CreateType (this TypeBuilder builder) + { + throw new NotSupportedException (); + } + } +} +#endif diff --git a/mcs/class/Mono.CSharp/monotouch.cs b/mcs/class/Mono.CSharp/monotouch.cs deleted file mode 100644 index 06feb3cc39..0000000000 --- a/mcs/class/Mono.CSharp/monotouch.cs +++ /dev/null @@ -1,824 +0,0 @@ -// -// monotouch.cs: iOS System.Reflection.Emit API needed to simplify mcs compilation -// -// Authors: -// Marek Safar -// -// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Reflection.Emit -{ - public class TypeBuilder : Type - { - #region implemented abstract members of MemberInfo - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override string Name { - get { - throw new NotSupportedException (); - } - } - - #endregion - - #region implemented abstract members of Type - - public override Type GetInterface (string name, bool ignoreCase) - { - throw new NotSupportedException (); - } - - public override Type[] GetInterfaces () - { - throw new NotSupportedException (); - } - - public override Type GetElementType () - { - throw new NotSupportedException (); - } - - public override EventInfo GetEvent (string name, BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override EventInfo[] GetEvents (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override FieldInfo GetField (string name, BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override FieldInfo[] GetFields (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override MemberInfo[] GetMembers (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - protected override MethodInfo GetMethodImpl (string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) - { - throw new NotSupportedException (); - } - - public override MethodInfo[] GetMethods (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override Type GetNestedType (string name, BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override Type[] GetNestedTypes (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override PropertyInfo[] GetProperties (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - protected override PropertyInfo GetPropertyImpl (string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) - { - throw new NotSupportedException (); - } - - protected override ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) - { - throw new NotSupportedException (); - } - - protected override TypeAttributes GetAttributeFlagsImpl () - { - throw new NotSupportedException (); - } - - protected override bool HasElementTypeImpl () - { - throw new NotSupportedException (); - } - - protected override bool IsArrayImpl () - { - throw new NotSupportedException (); - } - - protected override bool IsByRefImpl () - { - throw new NotSupportedException (); - } - - protected override bool IsCOMObjectImpl () - { - throw new NotSupportedException (); - } - - protected override bool IsPointerImpl () - { - throw new NotSupportedException (); - } - - protected override bool IsPrimitiveImpl () - { - throw new NotSupportedException (); - } - - public override ConstructorInfo[] GetConstructors (BindingFlags bindingAttr) - { - throw new NotSupportedException (); - } - - public override object InvokeMember (string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, System.Globalization.CultureInfo culture, string[] namedParameters) - { - throw new NotSupportedException (); - } - - public override Assembly Assembly { - get { - throw new NotSupportedException (); - } - } - - public override string AssemblyQualifiedName { - get { - throw new NotSupportedException (); - } - } - - public override Type BaseType { - get { - throw new NotSupportedException (); - } - } - - public override string FullName { - get { - throw new NotSupportedException (); - } - } - - public override Guid GUID { - get { - throw new NotSupportedException (); - } - } - - public override Module Module { - get { - throw new NotSupportedException (); - } - } - - public override string Namespace { - get { - throw new NotSupportedException (); - } - } - - public override Type UnderlyingSystemType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - public void AddInterfaceImplementation (Type interfaceType) - { - throw new NotSupportedException (); - } - - public void AddDeclarativeSecurity (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetParent (object arg) - { - throw new NotSupportedException (); - } - - public Type CreateType() - { - throw new NotSupportedException (); - } - - public ConstructorBuilder DefineConstructor (params object[] args) - { - throw new NotSupportedException (); - } - - public MethodBuilder DefineMethod (params object[] args) - { - throw new NotSupportedException (); - } - - public TypeBuilder DefineNestedType (params object[] args) - { - throw new NotSupportedException (); - } - - public PropertyBuilder DefineProperty (params object[] args) - { - throw new NotSupportedException (); - } - - public EventBuilder DefineEvent (params object[] args) - { - throw new NotSupportedException (); - } - - public FieldBuilder DefineField (params object[] args) - { - throw new NotSupportedException (); - } - - public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names) - { - throw new NotSupportedException (); - } - - public MethodBuilder DefineMethodOverride (params object[] args) - { - throw new NotSupportedException (); - } - - public static ConstructorInfo GetConstructor (Type type, ConstructorInfo constructor) - { - throw new NotSupportedException (); - } - - public static FieldInfo GetField (Type type, FieldInfo field) - { - throw new NotSupportedException (); - } - - public static MethodInfo GetMethod (Type type, MethodInfo method) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - - public class MethodBuilder : MethodBase - { - #region implemented abstract members of MemberInfo - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override Type DeclaringType { - get { - throw new NotSupportedException (); - } - } - - public override MemberTypes MemberType { - get { - throw new NotSupportedException (); - } - } - - public override string Name { - get { - throw new NotSupportedException (); - } - } - - public override Type ReflectedType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - #region implemented abstract members of MethodBase - - public override MethodImplAttributes GetMethodImplementationFlags () - { - throw new NotSupportedException (); - } - - public override ParameterInfo[] GetParameters () - { - throw new NotSupportedException (); - } - - public override object Invoke (object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, System.Globalization.CultureInfo culture) - { - throw new NotSupportedException (); - } - - public override RuntimeMethodHandle MethodHandle { - get { - throw new NotSupportedException (); - } - } - - public override MethodAttributes Attributes { - get { - throw new NotSupportedException (); - } - } - - #endregion - - public void AddDeclarativeSecurity (params object[] args) - { - throw new NotSupportedException (); - } - - public ParameterBuilder DefineParameter (params object[] args) - { - throw new NotSupportedException (); - } - - public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names) - { - throw new NotSupportedException (); - } - - public MethodToken GetToken() - { - throw new NotSupportedException (); - } - - public ILGenerator GetILGenerator () - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetImplementationFlags (MethodImplAttributes attributes) - { - throw new NotSupportedException (); - } - - public void SetParameters (params Type[] parameterTypes) - { - throw new NotSupportedException (); - } - - public void SetReturnType (object arg) - { - throw new NotSupportedException (); - } - } - - public class AssemblyBuilder : Assembly - { - public void AddResourceFile (params object[] args) - { - throw new NotSupportedException (); - } - - public void DefineVersionInfoResource (params object[] args) - { - throw new NotSupportedException (); - } - - public ModuleBuilder DefineDynamicModule (params object[] args) - { - throw new NotSupportedException (); - } - - public void DefineUnmanagedResource (params object[] args) - { - throw new NotSupportedException (); - } - - public void Save (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetEntryPoint (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - - public class ConstructorBuilder : MethodBase - { - #region implemented abstract members of MemberInfo - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override Type DeclaringType { - get { - throw new NotSupportedException (); - } - } - - public override MemberTypes MemberType { - get { - throw new NotSupportedException (); - } - } - - public override string Name { - get { - throw new NotSupportedException (); - } - } - - public override Type ReflectedType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - #region implemented abstract members of MethodBase - - public override MethodImplAttributes GetMethodImplementationFlags () - { - throw new NotSupportedException (); - } - - public override ParameterInfo[] GetParameters () - { - throw new NotSupportedException (); - } - - public override object Invoke (object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, System.Globalization.CultureInfo culture) - { - throw new NotSupportedException (); - } - - public override RuntimeMethodHandle MethodHandle { - get { - throw new NotSupportedException (); - } - } - - public override MethodAttributes Attributes { - get { - throw new NotSupportedException (); - } - } - - #endregion - - public void AddDeclarativeSecurity (params object[] args) - { - throw new NotSupportedException (); - } - - public ParameterBuilder DefineParameter (params object[] args) - { - throw new NotSupportedException (); - } - - public MethodToken GetToken() - { - throw new NotSupportedException (); - } - - public ILGenerator GetILGenerator () - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetImplementationFlags (MethodImplAttributes attributes) - { - throw new NotSupportedException (); - } - } - - public class ModuleBuilder : Module - { - public void DefineManifestResource (params object[] args) - { - throw new NotSupportedException (); - } - - public TypeBuilder DefineType (params object[] args) - { - throw new NotSupportedException (); - } - - public MethodToken GetToken() - { - throw new NotSupportedException (); - } - - public MethodInfo GetArrayMethod (params object[] args) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - - public class PropertyBuilder : PropertyInfo - { - #region implemented abstract members of MemberInfo - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override Type DeclaringType { - get { - throw new NotSupportedException (); - } - } - - public override string Name { - get { - throw new NotSupportedException (); - } - } - - public override Type ReflectedType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - #region implemented abstract members of PropertyInfo - - public override MethodInfo[] GetAccessors (bool nonPublic) - { - throw new NotSupportedException (); - } - - public override MethodInfo GetGetMethod (bool nonPublic) - { - throw new NotSupportedException (); - } - - public override ParameterInfo[] GetIndexParameters () - { - throw new NotSupportedException (); - } - - public override MethodInfo GetSetMethod (bool nonPublic) - { - throw new NotSupportedException (); - } - - public override object GetValue (object obj, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture) - { - throw new NotSupportedException (); - } - - public override void SetValue (object obj, object value, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture) - { - throw new NotSupportedException (); - } - - public override PropertyAttributes Attributes { - get { - throw new NotSupportedException (); - } - } - - public override bool CanRead { - get { - throw new NotSupportedException (); - } - } - - public override bool CanWrite { - get { - throw new NotSupportedException (); - } - } - - public override Type PropertyType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - public MethodToken GetToken() - { - throw new NotSupportedException (); - } - - public void SetGetMethod (object arg) - { - throw new NotSupportedException (); - } - - public void SetSetMethod (object arg) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - - public class FieldBuilder : FieldInfo - { - #region implemented abstract members of MemberInfo - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (bool inherit) - { - throw new NotSupportedException (); - } - - public override object[] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotSupportedException (); - } - - public override Type DeclaringType { - get { - throw new NotSupportedException (); - } - } - - public override string Name { - get { - throw new NotSupportedException (); - } - } - - public override Type ReflectedType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - #region implemented abstract members of FieldInfo - - public override object GetValue (object obj) - { - throw new NotSupportedException (); - } - - public override void SetValue (object obj, object value, BindingFlags invokeAttr, Binder binder, System.Globalization.CultureInfo culture) - { - throw new NotSupportedException (); - } - - public override FieldAttributes Attributes { - get { - throw new NotSupportedException (); - } - } - - public override RuntimeFieldHandle FieldHandle { - get { - throw new NotSupportedException (); - } - } - - public override Type FieldType { - get { - throw new NotSupportedException (); - } - } - - #endregion - - public void SetConstant (object arg) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - - public class EventBuilder - { - public void SetAddOnMethod (MethodBuilder mdBuilder) - { - throw new NotSupportedException (); - } - - public void SetRemoveOnMethod (MethodBuilder mdBuilder) - { - throw new NotSupportedException (); - } - - public void SetCustomAttribute (params object[] args) - { - throw new NotSupportedException (); - } - } - -} \ No newline at end of file diff --git a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources deleted file mode 100644 index 083e61afd3..0000000000 --- a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources deleted file mode 100644 index 083e61afd3..0000000000 --- a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources deleted file mode 100644 index 083e61afd3..0000000000 --- a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources deleted file mode 100644 index 394cd48583..0000000000 --- a/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include monotouch_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources deleted file mode 100644 index 4c30fc6e14..0000000000 --- a/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources +++ /dev/null @@ -1,4 +0,0 @@ -#include Mono.CSharp.dll.sources -../corlib/System.Reflection.Emit/PEFileKinds.cs -../corlib/System.Reflection.Emit/MethodToken.cs -monotouch.cs diff --git a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources deleted file mode 100644 index 4c30fc6e14..0000000000 --- a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources +++ /dev/null @@ -1,4 +0,0 @@ -#include Mono.CSharp.dll.sources -../corlib/System.Reflection.Emit/PEFileKinds.cs -../corlib/System.Reflection.Emit/MethodToken.cs -monotouch.cs diff --git a/mcs/class/Mono.Cecil/Consts.cs b/mcs/class/Mono.Cecil/Consts.cs new file mode 100644 index 0000000000..6ed785f311 --- /dev/null +++ b/mcs/class/Mono.Cecil/Consts.cs @@ -0,0 +1,5 @@ +static class Consts +{ + public const string AssemblyName = "Mono.Cecil"; + public const string PublicKey = "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df"; +} \ No newline at end of file diff --git a/mcs/class/Mono.Cecil/Makefile b/mcs/class/Mono.Cecil/Makefile index d8807afa49..16bba0c898 100644 --- a/mcs/class/Mono.Cecil/Makefile +++ b/mcs/class/Mono.Cecil/Makefile @@ -5,7 +5,7 @@ LIBRARY = Mono.Cecil.dll LIBRARY_SNK = ../mono.snk LIBRARY_PACKAGE = none -LIB_REFS = System.Core +LIB_REFS = System.Core System LIB_MCS_FLAGS = -keyfile:$(LIBRARY_SNK) -d:NET_4_0 /publicsign NO_TEST = yes diff --git a/mcs/class/Mono.Cecil/Mono.Cecil.dll.sources b/mcs/class/Mono.Cecil/Mono.Cecil.dll.sources index ed24c3b38a..c79662e74a 100644 --- a/mcs/class/Mono.Cecil/Mono.Cecil.dll.sources +++ b/mcs/class/Mono.Cecil/Mono.Cecil.dll.sources @@ -1,9 +1,93 @@ +Consts.cs ../../../external/cecil/ProjectInfo.cs ../../../external/cecil/Mono/*.cs -../../../external/cecil/Mono.Cecil/*.cs ../../../external/cecil/Mono.Cecil.Cil/*.cs ../../../external/cecil/Mono.Cecil.Metadata/*.cs ../../../external/cecil/Mono.Cecil.PE/*.cs ../../../external/cecil/Mono.Collections.Generic/*.cs ../../../external/cecil/Mono.Security.Cryptography/*.cs -../../../external/cecil/System.Security.Cryptography/*.cs + +../../../external/cecil/Mono.Cecil/ArrayType.cs +../../../external/cecil/Mono.Cecil/AssemblyDefinition.cs +../../../external/cecil/Mono.Cecil/AssemblyFlags.cs +../../../external/cecil/Mono.Cecil/AssemblyHashAlgorithm.cs +../../../external/cecil/Mono.Cecil/AssemblyInfo.cs +../../../external/cecil/Mono.Cecil/AssemblyLinkedResource.cs +../../../external/cecil/Mono.Cecil/AssemblyNameDefinition.cs +../../../external/cecil/Mono.Cecil/AssemblyNameReference.cs +../../../external/cecil/Mono.Cecil/AssemblyReader.cs +../../../external/cecil/Mono.Cecil/AssemblyWriter.cs +../../../external/cecil/Mono.Cecil/BaseAssemblyResolver.cs +../../../external/cecil/Mono.Cecil/CallSite.cs +../../../external/cecil/Mono.Cecil/CustomAttribute.cs +../../../external/cecil/Mono.Cecil/DefaultAssemblyResolver.cs +../../../external/cecil/Mono.Cecil/EmbeddedResource.cs +../../../external/cecil/Mono.Cecil/EventAttributes.cs +../../../external/cecil/Mono.Cecil/EventDefinition.cs +../../../external/cecil/Mono.Cecil/EventReference.cs +../../../external/cecil/Mono.Cecil/ExportedType.cs +../../../external/cecil/Mono.Cecil/FieldAttributes.cs +../../../external/cecil/Mono.Cecil/FieldDefinition.cs +../../../external/cecil/Mono.Cecil/FieldReference.cs +../../../external/cecil/Mono.Cecil/FileAttributes.cs +../../../external/cecil/Mono.Cecil/FunctionPointerType.cs +../../../external/cecil/Mono.Cecil/GenericInstanceMethod.cs +../../../external/cecil/Mono.Cecil/GenericInstanceType.cs +../../../external/cecil/Mono.Cecil/GenericParameter.cs +../../../external/cecil/Mono.Cecil/GenericParameterAttributes.cs +../../../external/cecil/Mono.Cecil/IConstantProvider.cs +../../../external/cecil/Mono.Cecil/ICustomAttributeProvider.cs +../../../external/cecil/Mono.Cecil/IGenericInstance.cs +../../../external/cecil/Mono.Cecil/IGenericParameterProvider.cs +../../../external/cecil/Mono.Cecil/IMarshalInfoProvider.cs +../../../external/cecil/Mono.Cecil/IMemberDefinition.cs +../../../external/cecil/Mono.Cecil/IMetadataScope.cs +../../../external/cecil/Mono.Cecil/IMetadataTokenProvider.cs +../../../external/cecil/Mono.Cecil/IMethodSignature.cs +../../../external/cecil/Mono.Cecil/Import.cs +../../../external/cecil/Mono.Cecil/LinkedResource.cs +../../../external/cecil/Mono.Cecil/ManifestResourceAttributes.cs +../../../external/cecil/Mono.Cecil/MarshalInfo.cs +../../../external/cecil/Mono.Cecil/MemberDefinitionCollection.cs +../../../external/cecil/Mono.Cecil/MemberReference.cs +../../../external/cecil/Mono.Cecil/MetadataResolver.cs +../../../external/cecil/Mono.Cecil/MetadataSystem.cs +../../../external/cecil/Mono.Cecil/MethodAttributes.cs +../../../external/cecil/Mono.Cecil/MethodCallingConvention.cs +../../../external/cecil/Mono.Cecil/MethodDefinition.cs +../../../external/cecil/Mono.Cecil/MethodImplAttributes.cs +../../../external/cecil/Mono.Cecil/MethodReference.cs +../../../external/cecil/Mono.Cecil/MethodReturnType.cs +../../../external/cecil/Mono.Cecil/MethodSemanticsAttributes.cs +../../../external/cecil/Mono.Cecil/MethodSpecification.cs +../../../external/cecil/Mono.Cecil/Modifiers.cs +../../../external/cecil/Mono.Cecil/ModuleDefinition.cs +../../../external/cecil/Mono.Cecil/ModuleKind.cs +../../../external/cecil/Mono.Cecil/ModuleReference.cs +../../../external/cecil/Mono.Cecil/NativeType.cs +../../../external/cecil/Mono.Cecil/PInvokeAttributes.cs +../../../external/cecil/Mono.Cecil/PInvokeInfo.cs +../../../external/cecil/Mono.Cecil/ParameterAttributes.cs +../../../external/cecil/Mono.Cecil/ParameterDefinition.cs +../../../external/cecil/Mono.Cecil/ParameterDefinitionCollection.cs +../../../external/cecil/Mono.Cecil/ParameterReference.cs +../../../external/cecil/Mono.Cecil/PinnedType.cs +../../../external/cecil/Mono.Cecil/PointerType.cs +../../../external/cecil/Mono.Cecil/PropertyAttributes.cs +../../../external/cecil/Mono.Cecil/PropertyDefinition.cs +../../../external/cecil/Mono.Cecil/PropertyReference.cs +../../../external/cecil/Mono.Cecil/ReferenceType.cs +../../../external/cecil/Mono.Cecil/Resource.cs +../../../external/cecil/Mono.Cecil/SecurityDeclaration.cs +../../../external/cecil/Mono.Cecil/SentinelType.cs +../../../external/cecil/Mono.Cecil/TargetRuntime.cs +../../../external/cecil/Mono.Cecil/Treatments.cs +../../../external/cecil/Mono.Cecil/TypeAttributes.cs +../../../external/cecil/Mono.Cecil/TypeDefinition.cs +../../../external/cecil/Mono.Cecil/TypeDefinitionCollection.cs +../../../external/cecil/Mono.Cecil/TypeParser.cs +../../../external/cecil/Mono.Cecil/TypeReference.cs +../../../external/cecil/Mono.Cecil/TypeSpecification.cs +../../../external/cecil/Mono.Cecil/TypeSystem.cs +../../../external/cecil/Mono.Cecil/VariantType.cs +../../../external/cecil/Mono.Cecil/WindowsRuntimeProjections.cs diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/Rewriter.cs b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/Rewriter.cs index 5654252415..66fb7f232c 100644 --- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/Rewriter.cs +++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Rewrite/Rewriter.cs @@ -67,33 +67,34 @@ namespace Mono.CodeContracts.Rewrite { if (options.Debug && options.WritePdbFile) readerParameters.ReadSymbols = true; - var assembly = this.options.Assembly.IsFilename ? + using (var assembly = this.options.Assembly.IsFilename ? AssemblyDefinition.ReadAssembly (options.Assembly.Filename, readerParameters) : - AssemblyDefinition.ReadAssembly (options.Assembly.Streams.Assembly, readerParameters); + AssemblyDefinition.ReadAssembly (options.Assembly.Streams.Assembly, readerParameters)) { - if (this.options.ForceAssemblyRename != null) { - assembly.Name.Name = this.options.ForceAssemblyRename; - } else if (this.options.OutputFile.IsSet && this.options.OutputFile.IsFilename) { - assembly.Name.Name = Path.GetFileNameWithoutExtension(this.options.OutputFile.Filename); - } + if (this.options.ForceAssemblyRename != null) { + assembly.Name.Name = this.options.ForceAssemblyRename; + } else if (this.options.OutputFile.IsSet && this.options.OutputFile.IsFilename) { + assembly.Name.Name = Path.GetFileNameWithoutExtension(this.options.OutputFile.Filename); + } - var output = this.options.OutputFile.IsSet ? this.options.OutputFile : this.options.Assembly; - var writerParameters = new WriterParameters (); - if (options.WritePdbFile) { - if (!options.Debug) { - return RewriterResults.Error ("Must specify -debug if using -writePDBFile."); + var output = this.options.OutputFile.IsSet ? this.options.OutputFile : this.options.Assembly; + var writerParameters = new WriterParameters (); + if (options.WritePdbFile) { + if (!options.Debug) { + return RewriterResults.Error ("Must specify -debug if using -writePDBFile."); + } + + writerParameters.WriteSymbols = true; } - writerParameters.WriteSymbols = true; - } - - PerformRewrite rewriter = new PerformRewrite (this.options); - rewriter.Rewrite (assembly); + PerformRewrite rewriter = new PerformRewrite (this.options); + rewriter.Rewrite (assembly); - if (output.IsFilename) { - assembly.Write (output.Filename, writerParameters); - } else { - assembly.Write (output.Streams.Assembly, writerParameters); + if (output.IsFilename) { + assembly.Write (output.Filename, writerParameters); + } else { + assembly.Write (output.Streams.Assembly, writerParameters); + } } return new RewriterResults (warnings, errors); diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/AssemblyNode.cs b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/AssemblyNode.cs index 04c7c6e0ba..adc51def4e 100644 --- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/AssemblyNode.cs +++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/AssemblyNode.cs @@ -72,7 +72,7 @@ namespace Mono.CodeContracts.Static.AST { public static AssemblyNode ReadAssembly (string filename) { - var readerParameters = new ReaderParameters (); + var readerParameters = new ReaderParameters () { InMemory = true }; AssemblyDefinition definition = AssemblyDefinition.ReadAssembly (filename, readerParameters); return new AssemblyNode (definition); diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs index 15339454b8..969346d0fd 100644 --- a/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs @@ -63,6 +63,38 @@ namespace MonoTests.Mono.Data.Sqlite } } + [Test] + public void DateTimeConvert_UTC () + { + using (var connection = new SqliteConnection ($"Data Source={_databasePath};DateTimeKind=Utc")) { + connection.Open (); + + using (var cmd = connection.CreateCommand ()) { + cmd.CommandText = "CREATE TABLE OnlyDates (Date1 DATETIME)"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery(); + } + + var datetest = DateTime.UtcNow; + + var sqlInsert = "INSERT INTO TestTable (ID, Modified) VALUES (@id, @mod)"; + using (var cmd = connection.CreateCommand ()) { + cmd.CommandText = $"INSERT INTO OnlyDates (Date1) VALUES (@param1);"; + cmd.CommandType = CommandType.Text; + cmd.Parameters.AddWithValue ("@param1", datetest); + cmd.ExecuteNonQuery(); + } + + using (var cmd = connection.CreateCommand ()) { + cmd.CommandText = $"SELECT Date1 FROM OnlyDates;"; + cmd.CommandType = CommandType.Text; + object objRetrieved = cmd.ExecuteScalar (); + var dateRetrieved = Convert.ToDateTime (objRetrieved); + Assert.AreEqual (DateTimeKind.Unspecified, dateRetrieved.Kind); + } + } + } + [Test] public void DateTimeConvert () { diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs index 3892035220..8e19ec9af9 100644 --- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs +++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs @@ -105,7 +105,7 @@ namespace Mono.Data.Tds.Protocol { } try { - socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + socket = new Socket (endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp); IAsyncResult ares = socket.BeginConnect (endPoint, null, null); int timeout_ms = timeout * 1000; if (timeout > 0 && !ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne (timeout_ms, false)) diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/FieldInfoMirror.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/FieldInfoMirror.cs index 6c53a6f464..6d4f370174 100644 --- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/FieldInfoMirror.cs +++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/FieldInfoMirror.cs @@ -200,6 +200,20 @@ namespace Mono.Debugger.Soft res.Add (attr); return res.ToArray (); } + + public string FullName { + get { + string type_namespace = DeclaringType.Namespace; + string type_name = DeclaringType.Name; + StringBuilder sb = new StringBuilder (); + if (type_namespace != String.Empty) + sb.Append (type_namespace).Append ("."); + sb.Append (type_name); + sb.Append (":"); + sb.Append (Name); + return sb.ToString (); + } + } } } diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs index 6cfa088437..400b43ce34 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs @@ -13,7 +13,6 @@ using System.Threading.Tasks; using System.Collections.Generic; using System.Linq; using System.Net.Sockets; -using System.Threading.Tasks; using MonoTests.Helpers; public class TestsBase @@ -319,6 +318,10 @@ public class Tests : TestsBase, ITest2 threadpool_io (); return 0; } + if (args.Length > 0 && args [0] == "attach") { + new Tests ().attach (); + return 0; + } assembly_load (); breakpoints (); single_stepping (); @@ -1688,6 +1691,26 @@ public class Tests : TestsBase, ITest2 streamOut.Close (); var bsIn = t.Result; } + + [MethodImplAttribute (MethodImplOptions.NoInlining)] + public void attach_break () { + } + + [MethodImplAttribute (MethodImplOptions.NoInlining)] + public void attach () { + AppDomain domain = AppDomain.CreateDomain ("domain"); + + CrossDomain o = (CrossDomain)domain.CreateInstanceAndUnwrap ( + typeof (CrossDomain).Assembly.FullName, "CrossDomain"); + o.assembly_load (); + o.type_load (); + + // Wait for the client to attach + while (true) { + Thread.Sleep (200); + attach_break (); + } + } } public class SentinelClass : MarshalByRefObject { @@ -1712,6 +1735,11 @@ public class CrossDomain : MarshalByRefObject public void assembly_load () { Tests.assembly_load_in_domain (); } + + public void type_load () { + //Activator.CreateInstance (typeof (int).Assembly.GetType ("Microsoft.Win32.RegistryOptions")); + var is_server = System.Runtime.GCSettings.IsServerGC; + } } public class Foo diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id index 446ae1de1c..7ddfc459f1 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id @@ -1 +1 @@ -61b3e31088102e4ffffb6bdae168636c1356d2de \ No newline at end of file +631b5985db1ff7129d11b1443984be1b7c2fabcb \ No newline at end of file diff --git a/mcs/class/Mono.Options/Documentation/en/Mono.Options/Command.xml b/mcs/class/Mono.Options/Documentation/en/Mono.Options/Command.xml new file mode 100644 index 0000000000..de2cda6e17 --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/Mono.Options/Command.xml @@ -0,0 +1,286 @@ + + + + + Mono.Options + 0.2.3.0 + + + Public static members of this type are thread safe. + Any instance members are not guaranteed to be thread safe. + + + System.Object + + + + + Represents a program command. + + + + Many command-line utilities are suites of commands, with a single + "outer" command and multiple commands. Examples of this style of + utility includes git, svn, and mdoc. + + + A Command represents a specific command in such a suite. + It has a which is the + command name for invocation purposes, optional help text through + the property, an optional + accessible through the + property for command-line + parsing, and two ways to have code executed when a command is + invoked: the property and + the method. + + + + + + + + Constructor + + 0.2.3.0 + + + + + + + + A which is the command name. + + + A which is the command help text. + + + Creates and initializes a new instance of the Command class. + + + + This constructor initializes the + property of the new + instance using and initializes the + property of the new + instance using . + + + + is . + + + + + + + Property + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + A instance which owns the + Command. + + + A instance which owns the + Command. + + + + A Command instance may belong to only one + instance. + The CommandSet property is set upon calling + . + + + If the Command instance has not yet been added to a + CommandSet, then this property is . + + + Use the CommandSet instance from either the + property or an overridden + method to access + localization facilities through + , the + preferred message output stream through + , and other features. + + + + + + + + Property + + 0.2.3.0 + + + System.String + + + + A short, one-line, description of the Command. + + + A containing the optional help text + of the Command. + + + + The Help property text is shown when the help + command is invoked. + + + + + + + + Method + + 0.2.3.0 + + + System.Int32 + + + + + + + A + which contains the unprocessed command-line arguments. + + + Invoked by when a command + has been executed. + + + A which should be treated as the process + exit value. + + + + The value returned by Invoke() is the return value of + , and should be treated + as a possible process exit value. + + + + If the Invoke() method is not overridden by a subclass, + the Invoke() method will use + to parse + , and pass any un-processed values + on to . + + + If the Options property is , then no + option processing will occur, and + will be provided to the Run property as-is. + + + If the Run property is , then + no further processing occurs. + + + + + Method overrides do not need to call the base class method. + + + + + + + + + Property + + 0.2.3.0 + + + System.String + + + + The name of the Command, which is used for command invocation. + + + A which is the name of the Command. + + + + The Name value must be unique across all Commmand instances + referred to by a . + + + + + + + + Property + + 0.2.3.0 + + + Mono.Options.OptionSet + + + + Optional command-line option information. + + + A instance which contains the + available command-line options for the Command. + + + + If the Options property is not when + the command is processed, + will be invoked on + the Options instance, and the return value of + OptionSet.Parse() will be forwarded to + . + + + + + + + + Property + + 0.2.3.0 + + + System.Action<System.Collections.Generic.IEnumerable<System.String>> + + + + Optional command handler. + + + A + delegate which is executed by + . + + + + The Run property is executed by the the + method when + dispatches to a + Command instance. + + + + + + diff --git a/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml b/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml new file mode 100644 index 0000000000..5d82495a05 --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/Mono.Options/CommandSet.xml @@ -0,0 +1,1349 @@ + + + + + + Mono.Options + 0.2.3.0 + + + Public static members of this type are thread safe. + Any instance members are not guaranteed to be thread safe. + + + System.Collections.ObjectModel.KeyedCollection<System.String,Mono.Options.Command> + + System.String + Mono.Options.Command + + + + + + A suite of commands, global program options, and associated documentation. + + + + A common requirement of some programs are discrete commands. + A CommandSet represents a suite of commands, intermixed + with suite documentation. Commands are managed by + instances, which have a required + name and optional help text, and CommandSet will use the + intermixed documentation, options, and commands to produce help + command output. + + + To create a CommandSet instance, use the + + constructor. Only the suite name is required; all other parameters are + optional. + + + Once a CommandSet instance has been constructed, use the + methods to add and + intermix suite documentation, global options, and commands. + Documentation is any string constant, global options are handled + by instances and associated + Add() method overloads which implicitly create Option + instances, and commands are through Command instances. + + + Once the CommandSet instance has been initialized, call the + + method to process the arguments provided to Main(). + The appropriate Command instance will be determined, it's + options parsed, and + will be executed. The return value of Command.Invoke() + is returned from CommandSet.Run(), and should be treated + as the process exit value. + + + + + The following commands example demonstrates some simple usage + of . + + // Sub-commands with Mono.Options.CommandSet +// +// Compile as: +// mcs -r:Mono.Options.dll commands.cs + +using System; +using System.Collections.Generic; + +using Mono.Options; + +class CommandDemo { + public static int Main (string[] args) + { + var commands = new CommandSet ("commands") { + "usage: commands COMMAND [OPTIONS]", + "", + "Mono.Options.CommandSet sample app.", + "", + "Global options:", + { "v:", + "Output verbosity.", + (int? n) => Verbosity = n.HasValue ? n.Value : Verbosity + 1 }, + "", + "Available commands:", + new Command ("echo", "Echo arguments to the screen") { + Run = ca => Console.WriteLine ("{0}", string.Join (" ", ca)), + }, + new RequiresArgs (), + }; + return commands.Run (args); + } + + public static int Verbosity; +} + +class RequiresArgs : Command { + + public RequiresArgs () + : base ("requires-args", "Class-based Command subclass") + { + Options = new OptionSet () { + "usage: commands requires-args [OPTIONS]", + "", + "Class-based Command subclass example.", + { "name|n=", + "{name} of person to greet.", + v => Name = v }, + { "help|h|?", + "Show this message and exit.", + v => ShowHelp = v != null }, + }; + } + + public bool ShowHelp {get; private set;} + public new string Name {get; private set;} + + public override int Invoke (IEnumerable<string> args) + { + try { + var extra = Options.Parse (args); + if (ShowHelp) { + Options.WriteOptionDescriptions (CommandSet.Out); + return 0; + } + if (string.IsNullOrEmpty (Name)) { + Console.Error.WriteLine ("commands: Missing required argument `--name=NAME`."); + Console.Error.WriteLine ("commands: Use `commands help requires-args` for details."); + return 1; + } + Console.WriteLine ($"Hello, {Name}!"); + return 0; + } + catch (Exception e) { + Console.Error.WriteLine ("commands: {0}", CommandDemo.Verbosity >= 1 ? e.ToString () : e.Message); + return 1; + } + } +} + + + The output, under the influence of different command-line arguments, is: + + $ mono commands.exe +Use `commands help` for usage. + +$ mono commands.exe --help +usage: commands COMMAND [OPTIONS] + +Mono.Options.CommandSet sample app. + +Global options: + -v[=VALUE] Output verbosity. + +Available commands: + echo Echo arguments to the screen + requires-args Class-based Command subclass + +$ mono commands.exe help +usage: commands COMMAND [OPTIONS] + +Mono.Options.CommandSet sample app. + +Global options: + -v[=VALUE] Output verbosity. + +Available commands: + echo Echo arguments to the screen + requires-args Class-based Command subclass + +$ mono commands.exe help --help +Usage: commands COMMAND [OPTIONS] +Use `commands help COMMAND` for help on a specific command. + +Available commands: + + echo Echo arguments to the screen + requires-args Class-based Command subclass + help Show this message and exit + +$ mono commands.exe help echo +--help + +$ mono commands.exe echo --help +--help + +$ mono commands.exe echo hello, world +hello, world + +$ mono commands.exe requires-args +commands: Missing required argument `--name=NAME`. +commands: Use `commands help requires-args` for details. + +$ mono commands.exe help requires-args +usage: commands requires-args [OPTIONS] + +Class-based Command subclass example. + --name, -n=name name of person to greet. + --help, -h, -? Show this message and exit. + +$ mono commands.exe requires-args --help +usage: commands requires-args [OPTIONS] + +Class-based Command subclass example. + --name, -n=name name of person to greet. + --help, -h, -? Show this message and exit. + +$ mono commands.exe requires-args -n World +Hello, World! + +$ mono commands.exe invalid-command +commands: Unknown command: invalid-command +commands: Use `commands help` for usage. + +$ mono commands.exe help invalid-command +commands: Unknown command: invalid-command +commands: Use `commands help` for usage. + + + The commands.exe output is short, informing the user that + commands are required for use. + + + The commands.exe --help is identical to the commands help + output, and shows the provided suite documentation. + + + commands.exe COMMAND --help and commands.exe help COMMAND + output is likewise identical, and will attempt to generate documentation + for the specified command, if available. This is performed by invoking + + with the value { "--help" }. This can be seen in the + commands.exe help echo and commands.exe echo --help + output, which simply prints --help. If a command wants + to partake in help COMMAND support, it needs to explicitly + handle the --help option in its associated + instance, referenced by the + property. + + + Finally, if an invalid command is specified, then an error is written + to , prefixed with the + value. + + + + + + + + Constructor + + 0.2.3.0 + + + + + + + + + + A containing the name of the suite. + This value is used in default help text output. + + + A + instance that will be used to translate strings. + If , then no localization is performed. + + + A where output messages will be + written to. If , then the + property will be used. + + + A where error messages will be + written to. If , then the + property will be used. + + + Creates and initializes a new CommandSet instance. + + + + This constructor initializes + the property + of the new instance using , + the property + of the new instance using , + the property + of the new instance using , and + the property + of the new instance using . + + + + is . + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + A to register for + argument processing. + + + Registers so that it may be consulted + during argument processing within + . + + + The current instance. + This is to permit method chaining. + + + + + is . + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + A to add to the suite. + + + Add a Command to the suite. + + + The current instance. + This is to permit method chaining. + + + + + + A Command with the same value for + .Name + has already been added to the CommandSet. + + -or- + + has been Add()ed to a different + CommandSet instance. + + + + is . + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + The to register. + + + Adds as a global suite option. + + + The current instance. + This is to permit method chaining. + + + + Registers each option name returned by + , ensuring that any + option with a matching name will be handled by the + instance. + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + is . + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + A containing the header to display + during help processing. + + + Declare a header to be printed during for help output. + + + The current instance. + This is to permit method chaining. + + + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + Calls + + with a value of + . + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + Calls + + with a value of + . + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A to be used to initialize + the property. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + Use this method when should accept + two values, generally a key and a value. + + + If specifies a + option, + then it's possible that both the key and the value will be + in the callback function. + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A containing to used to initialize + the property. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A containing to used to initialize + the property. + + + A + to invoke when an option is parsed. + + + A specifying whether or not the + Option should be displayed in + help output. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A containing to used to initialize + the property. + + + A + to invoke when an option is parsed. + + + A specifying whether or not the + Option should be displayed in + help output. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + + The type of the option to parse and provide to the + callback. + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + Calls + + with a value of + . + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + + + The type of the option to parse and provide to the + callback. + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A containing to used to initialize + the property. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + Use this typed overload when you want strongly typed option values + that correspond to a managed type. + + is used to lookup the + to use when + performing the string-to-type conversion. + + + Special support is provided for + types; + doesn't currently support their use, but if + is a nullable type, then this method + will instead use the + for the + type. This allows straightforward use + of nullable types, identical to using any other strongly typed + value. + + + + If specifies an + value + and the value is not provided, then default(T) is + provided as the value to . + + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + + + The type of the first argument to parse and provide to the + callback. + + + The type of the second argument to parse and provide to the + callback. + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + Calls + + with a value of + . + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Method + + 0.2.3.0 + + + Mono.Options.CommandSet + + + + + + + + + + + + + The type of the first argument to parse and provide to the + callback. + + + The type of the second argument to parse and provide to the + callback. + + + A containing all option aliases to + register, an (optional) type specifier, and an (optional) value + separator list; see + + for details. + + + A to be used to initialize + the property. + + + A + to invoke when an option is parsed. + + + Registers each alias within so that any + options matching the aliases in will be + handled by during any subsequent + + calls. + + + The current instance. + This is to permit method chaining. + + + + Use this method when should accept + two typed values, generally a key and a value. + + + + If specifies an + value + and the value is not provided, then default(TKey) and + default(TValue) may be provided as the values to + . + + + + + + has an alias (as returned from + ) that conflicts with + a previously registered . + + + + is + -or- + + is + + + + + + + Property + + 0.2.3.0 + + + System.IO.TextWriter + + + + Where CommandSet should write error messages. + + + A where error messages will + be written to. + + + + This value may be set by providing the + constructor parameter. If not specified, then + will be used. + + + Error messages by CommandSet are written to the Error + property. Command instances may also choose to write error + messages to the CommandSet.Error property. This is suggested + to help with unit testing. + + + + + + + + Method + + 0.2.3.0 + + + System.String + + + + + + + An to return the key of. + + + Returns .Name. + + + A containing the command name. + + + + This is to support the + + infrastructure. + + + + + + + + Property + + 0.2.3.0 + + + System.Converter<System.String,System.String> + + + + Permits access to the message localization facility. + + + A + that can be used to localize messages. + + + + + + + + + Property + + 0.2.3.0 + + + System.IO.TextWriter + + + + Where CommandSet should write output messages. + + + A where output messages will + be written to. + + + + This value may be set by providing the + constructor parameter. If not specified, then + will be used. + + + Output messages by CommandSet are written to the Out + property. Command instances may also choose to write output + messages to the CommandSet.Out property. This is suggested + to help with unit testing. + + + + + + + + Method + + 0.2.3.0 + + + System.Int32 + + + + + + + A + containing the command-line arguments to process. + + + Processes command-line arguments and invokes the specified command. + + + A containing the command's exit value. + Normal Unix process exit values should be used: 0 for success, + non-zero values for failures. + + + + Processes , parsing global options in the first pass. + The first unprocessed argument is treated as a command name, and the + instance with a + value matching the command name + has its method invoked with the + unprocessed arguments. + + + + If no command is specified within or an invalid command name is specified, then 1 is returned. + Otherwise, the value returned from + is returned. + + + + If the help command is provided with no arguments, then the + suite help text will be written to + + consisting of the descriptive text ("headers"), options, and + Command values provided to + . + + + If the help command is provided with --help as an + argument, then all registered Command instances are written to + . + + + If the help command is provided with any other string, the + following value is treated as a command name, and the output of + command --help is written to + . If the specified + command name has not been registered, then an error message is written to + . + + + + + + + + Property + + 0.2.3.0 + + + System.String + + + + The name of the suite. + + + A containing the name of the command suite. + + + + The Suite value is used when no command is specified, or + when an unregistered command name is provided. + + + + + + \ No newline at end of file diff --git a/mcs/class/Mono.Options/Documentation/en/Mono.Options/HelpCommand.xml b/mcs/class/Mono.Options/Documentation/en/Mono.Options/HelpCommand.xml new file mode 100644 index 0000000000..74af856432 --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/Mono.Options/HelpCommand.xml @@ -0,0 +1,51 @@ + + + + + Mono.Options + 0.2.3.0 + + + Mono.Options.Command + + + + To be added. + To be added. + + + + + + Constructor + + 0.2.3.0 + + + + To be added. + To be added. + + + + + + Method + + 0.2.3.0 + + + System.Int32 + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/class/Mono.Options/Documentation/en/Mono.Options/OptionSet.xml.REMOVED.git-id b/mcs/class/Mono.Options/Documentation/en/Mono.Options/OptionSet.xml.REMOVED.git-id index 087781f1ca..3bceabe674 100644 --- a/mcs/class/Mono.Options/Documentation/en/Mono.Options/OptionSet.xml.REMOVED.git-id +++ b/mcs/class/Mono.Options/Documentation/en/Mono.Options/OptionSet.xml.REMOVED.git-id @@ -1 +1 @@ -67225ad77680005658a2e3e423e91d7120289bdc \ No newline at end of file +56ba9fdfdbae727a7812af0e87eb613942f9b05e \ No newline at end of file diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.cs b/mcs/class/Mono.Options/Documentation/en/examples/commands.cs new file mode 100644 index 0000000000..d8c48e4838 --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.cs @@ -0,0 +1,78 @@ +// Sub-commands with Mono.Options.CommandSet +// +// Compile as: +// mcs -r:Mono.Options.dll commands.cs + +using System; +using System.Collections.Generic; + +using Mono.Options; + +class CommandDemo { + public static int Main (string[] args) + { + var commands = new CommandSet ("commands") { + "usage: commands COMMAND [OPTIONS]", + "", + "Mono.Options.CommandSet sample app.", + "", + "Global options:", + { "v:", + "Output verbosity.", + (int? n) => Verbosity = n.HasValue ? n.Value : Verbosity + 1 }, + "", + "Available commands:", + new Command ("echo", "Echo arguments to the screen") { + Run = ca => Console.WriteLine ("{0}", string.Join (" ", ca)), + }, + new RequiresArgs (), + }; + return commands.Run (args); + } + + public static int Verbosity; +} + +class RequiresArgs : Command { + + public RequiresArgs () + : base ("requires-args", "Class-based Command subclass") + { + Options = new OptionSet () { + "usage: commands requires-args [OPTIONS]", + "", + "Class-based Command subclass example.", + { "name|n=", + "{name} of person to greet.", + v => Name = v }, + { "help|h|?", + "Show this message and exit.", + v => ShowHelp = v != null }, + }; + } + + public bool ShowHelp {get; private set;} + public new string Name {get; private set;} + + public override int Invoke (IEnumerable args) + { + try { + var extra = Options.Parse (args); + if (ShowHelp) { + Options.WriteOptionDescriptions (CommandSet.Out); + return 0; + } + if (string.IsNullOrEmpty (Name)) { + Console.Error.WriteLine ("commands: Missing required argument `--name=NAME`."); + Console.Error.WriteLine ("commands: Use `commands help requires-args` for details."); + return 1; + } + Console.WriteLine ($"Hello, {Name}!"); + return 0; + } + catch (Exception e) { + Console.Error.WriteLine ("commands: {0}", CommandDemo.Verbosity >= 1 ? e.ToString () : e.Message); + return 1; + } + } +} diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.in b/mcs/class/Mono.Options/Documentation/en/examples/commands.in new file mode 100644 index 0000000000..96855a870e --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.in @@ -0,0 +1,25 @@ +mono Documentation/en/examples/commands.exe + +mono Documentation/en/examples/commands.exe --help + +mono Documentation/en/examples/commands.exe help + +mono Documentation/en/examples/commands.exe help --help + +mono Documentation/en/examples/commands.exe help echo + +mono Documentation/en/examples/commands.exe echo --help + +mono Documentation/en/examples/commands.exe echo hello, world + +mono Documentation/en/examples/commands.exe requires-args + +mono Documentation/en/examples/commands.exe help requires-args + +mono Documentation/en/examples/commands.exe requires-args --help + +mono Documentation/en/examples/commands.exe requires-args -n World + +mono Documentation/en/examples/commands.exe invalid-command + +mono Documentation/en/examples/commands.exe help invalid-command diff --git a/mcs/class/Mono.Options/Documentation/en/examples/commands.txt b/mcs/class/Mono.Options/Documentation/en/examples/commands.txt new file mode 100644 index 0000000000..1930680114 --- /dev/null +++ b/mcs/class/Mono.Options/Documentation/en/examples/commands.txt @@ -0,0 +1,74 @@ +$ mono commands.exe +Use `commands help` for usage. + +$ mono commands.exe --help +usage: commands COMMAND [OPTIONS] + +Mono.Options.CommandSet sample app. + +Global options: + -v[=VALUE] Output verbosity. + +Available commands: + echo Echo arguments to the screen + requires-args Class-based Command subclass + +$ mono commands.exe help +usage: commands COMMAND [OPTIONS] + +Mono.Options.CommandSet sample app. + +Global options: + -v[=VALUE] Output verbosity. + +Available commands: + echo Echo arguments to the screen + requires-args Class-based Command subclass + +$ mono commands.exe help --help +Usage: commands COMMAND [OPTIONS] +Use `commands help COMMAND` for help on a specific command. + +Available commands: + + echo Echo arguments to the screen + requires-args Class-based Command subclass + help Show this message and exit + +$ mono commands.exe help echo +--help + +$ mono commands.exe echo --help +--help + +$ mono commands.exe echo hello, world +hello, world + +$ mono commands.exe requires-args +commands: Missing required argument `--name=NAME`. +commands: Use `commands help requires-args` for details. + +$ mono commands.exe help requires-args +usage: commands requires-args [OPTIONS] + +Class-based Command subclass example. + --name, -n=name name of person to greet. + --help, -h, -? Show this message and exit. + +$ mono commands.exe requires-args --help +usage: commands requires-args [OPTIONS] + +Class-based Command subclass example. + --name, -n=name name of person to greet. + --help, -h, -? Show this message and exit. + +$ mono commands.exe requires-args -n World +Hello, World! + +$ mono commands.exe invalid-command +commands: Unknown command: invalid-command +commands: Use `commands help` for usage. + +$ mono commands.exe help invalid-command +commands: Unknown command: invalid-command +commands: Use `commands help` for usage. diff --git a/mcs/class/Mono.Options/Documentation/en/index.xml b/mcs/class/Mono.Options/Documentation/en/index.xml index 4cdca7c2a7..f8fdaddee4 100644 --- a/mcs/class/Mono.Options/Documentation/en/index.xml +++ b/mcs/class/Mono.Options/Documentation/en/index.xml @@ -18,6 +18,9 @@ System.Reflection.AssemblyTitle("Mono.Options.dll") + + System.Runtime.CompilerServices.CompilationRelaxations(8) + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) @@ -30,6 +33,9 @@ + + + diff --git a/mcs/class/Mono.Options/Makefile b/mcs/class/Mono.Options/Makefile index 2fb4724b28..af1350df5b 100644 --- a/mcs/class/Mono.Options/Makefile +++ b/mcs/class/Mono.Options/Makefile @@ -17,6 +17,16 @@ mono_options_DATA = Mono.Options/Options.cs include ../../build/library.make +test-local: Mono.Options-PCL.dll + +clean-local: clean-pcl + +Mono.Options-PCL.dll: Mono.Options.dll.sources $(shell cat Mono.Options.dll.sources) + $(CSCOMPILE) -target:library -out:$@ -debug+ -d:PCL -r:../lib/$(PROFILE)/System.dll @$< + +clean-pcl: + -rm Mono.Options-PCL.dll + install-local: install-source uninstall-local: uninstall-source @@ -35,6 +45,7 @@ fixup-docs: DOC_EXAMPLES_OUTPUT = \ Documentation/en/examples/bundling.txt \ + Documentation/en/examples/commands.txt \ Documentation/en/examples/context.txt \ Documentation/en/examples/greet.txt \ Documentation/en/examples/localization.txt \ @@ -44,10 +55,10 @@ $(the_libdir)/.doc-stamp: $(DOC_EXAMPLES_OUTPUT) Documentation/en/examples/Mono.Options.dll: $(the_lib) cp $^ $@ - -cp $^.mdb $@.mdb %.exe: %.cs Documentation/en/examples/Mono.Options.dll - $(CSCOMPILE) -debug+ -r:Mono.Posix.dll -r:System.Core.dll -lib:Documentation/en/examples -r:Mono.Options.dll -out:$@ $< + $(CSCOMPILE) -debug:portable -r:$(topdir)/class/lib/$(PROFILE)/Mono.Posix.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll \ + -r:$(topdir)/class/lib/$(PROFILE)/Mono.Options.dll -out:$@ $< Documentation/en/examples/locale/es/LC_MESSAGES/localization.mo: Documentation/en/examples/localization-es.po msgfmt $< -o $@ diff --git a/mcs/class/Mono.Options/Mono.Options/Options.cs b/mcs/class/Mono.Options/Mono.Options/Options.cs index 05810c3948..029bcb87dd 100644 --- a/mcs/class/Mono.Options/Mono.Options/Options.cs +++ b/mcs/class/Mono.Options/Mono.Options/Options.cs @@ -2,13 +2,14 @@ // Options.cs // // Authors: -// Jonathan Pryor +// Jonathan Pryor , // Federico Di Gregorio // Rolf Bjarne Kvinge // // Copyright (C) 2008 Novell (http://www.novell.com) // Copyright (C) 2009 Federico Di Gregorio. // Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com) +// Copyright (C) 2017 Microsoft Corporation (http://www.microsoft.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -31,8 +32,8 @@ // // Compile With: -// gmcs -debug+ -r:System.Core Options.cs -o:NDesk.Options.dll -// gmcs -debug+ -d:LINQ -r:System.Core Options.cs -o:NDesk.Options.dll +// mcs -debug+ -r:System.Core Options.cs -o:Mono.Options.dll +// mcs -debug+ -d:LINQ -r:System.Core Options.cs -o:Mono.Options.dll // // The LINQ version just changes the implementation of // OptionSet.Parse(IEnumerable), and confers no semantic changes. @@ -40,7 +41,7 @@ // // A Getopt::Long-inspired option parsing library for C#. // -// NDesk.Options.OptionSet is built upon a key/value table, where the +// Mono.Options.OptionSet is built upon a key/value table, where the // key is a option format string and the value is a delegate that is // invoked when the format string is matched. // @@ -127,6 +128,33 @@ // p.Parse (new string[]{"-a-"}); // sets v == null // +// +// Mono.Options.CommandSet allows easily having separate commands and +// associated command options, allowing creation of a *suite* along the +// lines of **git**(1), **svn**(1), etc. +// +// CommandSet allows intermixing plain text strings for `--help` output, +// Option values -- as supported by OptionSet -- and Command instances, +// which have a name, optional help text, and an optional OptionSet. +// +// var suite = new CommandSet ("suite-name") { +// // Use strings and option values, as with OptionSet +// "usage: suite-name COMMAND [OPTIONS]+", +// { "v:", "verbosity", (int? v) => Verbosity = v.HasValue ? v.Value : Verbosity+1 }, +// // Commands may also be specified +// new Command ("command-name", "command help") { +// Options = new OptionSet {/*...*/}, +// Run = args => { /*...*/}, +// }, +// new MyCommandSubclass (), +// }; +// return suite.Run (new string[]{...}); +// +// CommandSet provides a `help` command, and forwards `help COMMAND` +// to the registered Command instance by invoking Command.Invoke() +// with `--help` as an option. +// + using System; using System.Collections; using System.Collections.Generic; @@ -414,7 +442,7 @@ namespace Mono.Options ? new[]{prototype + this.GetHashCode ()} : prototype.Split ('|'); - if (this is OptionSet.Category) + if (this is OptionSet.Category || this is CommandOption) return; this.type = ParsePrototype (); @@ -585,6 +613,11 @@ namespace Mono.Options protected abstract void OnParseComplete (OptionContext c); + internal void InvokeOnParseComplete (OptionContext c) + { + OnParseComplete (c); + } + public override string ToString () { return Prototype; @@ -732,20 +765,26 @@ namespace Mono.Options public class OptionSet : KeyedCollection { public OptionSet () - : this (delegate (string f) {return f;}) + : this (null) { } public OptionSet (MessageLocalizerConverter localizer) { + this.roSources = new ReadOnlyCollection (sources); this.localizer = localizer; - this.roSources = new ReadOnlyCollection(sources); + if (this.localizer == null) { + this.localizer = delegate (string f) { + return f; + }; + } } MessageLocalizerConverter localizer; public MessageLocalizerConverter MessageLocalizer { get {return localizer;} + internal set {localizer = value;} } List sources = new List (); @@ -1210,6 +1249,9 @@ namespace Mono.Options private const int Description_FirstWidth = 80 - OptionWidth; private const int Description_RemWidth = 80 - OptionWidth - 2; + static readonly string CommandHelpIndentStart = new string (' ', OptionWidth); + static readonly string CommandHelpIndentRemaining = new string (' ', OptionWidth + 2); + public void WriteOptionDescriptions (TextWriter o) { foreach (Option p in this) { @@ -1223,6 +1265,11 @@ namespace Mono.Options WriteDescription (o, p.Description, "", 80, 80); continue; } + CommandOption co = p as CommandOption; + if (co != null) { + WriteCommandDescription (o, co.Command); + continue; + } if (!WriteOptionPrototype (o, p, ref written)) continue; @@ -1264,6 +1311,17 @@ namespace Mono.Options } } + internal void WriteCommandDescription (TextWriter o, Command c) + { + var name = new string (' ', 8) + c.Name; + if (name.Length < OptionWidth - 1) { + WriteDescription (o, name + new string (' ', OptionWidth - name.Length) + c.Help, CommandHelpIndentRemaining, 80, Description_RemWidth); + } else { + WriteDescription (o, name, "", 80, 80); + WriteDescription (o, CommandHelpIndentStart + c.Help, CommandHelpIndentRemaining, 80, Description_RemWidth); + } + } + void WriteDescription (TextWriter o, string value, string prefix, int firstWidth, int remWidth) { bool indent = false; @@ -1403,5 +1461,341 @@ namespace Mono.Options return StringCoda.WrappedLines (description, firstWidth, remWidth); } } + + public class Command + { + public string Name {get;} + public string Help {get;} + + public OptionSet Options {get; set;} + public Action> Run {get; set;} + + public CommandSet CommandSet {get; internal set;} + + public Command (string name, string help = null) + { + if (string.IsNullOrEmpty (name)) + throw new ArgumentNullException (nameof (name)); + + Name = name; + Help = help; + } + + public virtual int Invoke (IEnumerable arguments) + { + var rest = Options?.Parse (arguments) ?? arguments; + Run?.Invoke (rest); + return 0; + } + } + + class CommandOption : Option + { + public Command Command {get;} + + // Prototype starts with '=' because this is an invalid prototype + // (see Option.ParsePrototype(), and thus it'll prevent Category + // instances from being accidentally used as normal options. + public CommandOption (Command command, bool hidden = false) + : base ("=:Command:= " + command?.Name, command?.Name, maxValueCount: 0, hidden: hidden) + { + if (command == null) + throw new ArgumentNullException (nameof (command)); + Command = command; + } + + protected override void OnParseComplete (OptionContext c) + { + throw new NotSupportedException ("CommandOption.OnParseComplete should not be invoked."); + } + } + + class HelpOption : Option + { + Option option; + CommandSet commands; + + public HelpOption (CommandSet commands, Option d) + : base (d.Prototype, d.Description, d.MaxValueCount, d.Hidden) + { + this.commands = commands; + this.option = d; + } + + protected override void OnParseComplete (OptionContext c) + { + commands.showHelp = true; + + option?.InvokeOnParseComplete (c); + } + } + + class CommandOptionSet : OptionSet + { + CommandSet commands; + + public CommandOptionSet (CommandSet commands, MessageLocalizerConverter localizer) + : base (localizer) + { + this.commands = commands; + } + + protected override void SetItem (int index, Option item) + { + if (ShouldWrapOption (item)) { + base.SetItem (index, new HelpOption (commands, item)); + return; + } + base.SetItem (index, item); + } + + bool ShouldWrapOption (Option item) + { + if (item == null) + return false; + var help = item as HelpOption; + if (help != null) + return false; + foreach (var n in item.Names) { + if (n == "help") + return true; + } + return false; + } + + protected override void InsertItem (int index, Option item) + { + if (ShouldWrapOption (item)) { + base.InsertItem (index, new HelpOption (commands, item)); + return; + } + base.InsertItem (index, item); + } + } + + public class CommandSet : KeyedCollection + { + readonly OptionSet options; + readonly TextWriter outWriter; + readonly TextWriter errorWriter; + readonly string suite; + + HelpCommand help; + + internal bool showHelp; + + internal OptionSet Options => options; + + public CommandSet (string suite, MessageLocalizerConverter localizer = null, TextWriter output = null, TextWriter error = null) + { + if (suite == null) + throw new ArgumentNullException (nameof (suite)); + this.suite = suite; + options = new CommandOptionSet (this, localizer); + outWriter = output ?? Console.Out; + errorWriter = error ?? Console.Error; + } + + public string Suite => suite; + public TextWriter Out => outWriter; + public TextWriter Error => errorWriter; + public MessageLocalizerConverter MessageLocalizer => options.MessageLocalizer; + + protected override string GetKeyForItem (Command item) + { + return item?.Name; + } + + public new CommandSet Add (Command value) + { + if (value == null) + throw new ArgumentNullException (nameof (value)); + AddCommand (value); + options.Add (new CommandOption (value)); + return this; + } + + void AddCommand (Command value) + { + if (value.CommandSet != null && value.CommandSet != this) { + throw new ArgumentException ("Command instances can only be added to a single CommandSet.", nameof (value)); + } + value.CommandSet = this; + if (value.Options != null) { + value.Options.MessageLocalizer = options.MessageLocalizer; + } + + base.Add (value); + + help = help ?? value as HelpCommand; + } + + public CommandSet Add (string header) + { + options.Add (header); + return this; + } + + public CommandSet Add (Option option) + { + options.Add (option); + return this; + } + + public CommandSet Add (string prototype, Action action) + { + options.Add (prototype, action); + return this; + } + + public CommandSet Add (string prototype, string description, Action action) + { + options.Add (prototype, description, action); + return this; + } + + public CommandSet Add (string prototype, string description, Action action, bool hidden) + { + options.Add (prototype, description, action, hidden); + return this; + } + + public CommandSet Add (string prototype, OptionAction action) + { + options.Add (prototype, action); + return this; + } + + public CommandSet Add (string prototype, string description, OptionAction action) + { + options.Add (prototype, description, action); + return this; + } + + public CommandSet Add (string prototype, string description, OptionAction action, bool hidden) + { + options.Add (prototype, description, action, hidden); + return this; + } + + public CommandSet Add (string prototype, Action action) + { + options.Add (prototype, null, action); + return this; + } + + public CommandSet Add (string prototype, string description, Action action) + { + options.Add (prototype, description, action); + return this; + } + + public CommandSet Add (string prototype, OptionAction action) + { + options.Add (prototype, action); + return this; + } + + public CommandSet Add (string prototype, string description, OptionAction action) + { + options.Add (prototype, description, action); + return this; + } + + public CommandSet Add (ArgumentSource source) + { + options.Add (source); + return this; + } + + public int Run (IEnumerable arguments) + { + if (arguments == null) + throw new ArgumentNullException (nameof (arguments)); + + this.showHelp = false; + if (help == null) { + help = new HelpCommand (); + AddCommand (help); + } + Action setHelp = v => showHelp = v != null; + if (!options.Contains ("help")) { + options.Add ("help", "", setHelp, hidden: true); + } + if (!options.Contains ("?")) { + options.Add ("?", "", setHelp, hidden: true); + } + var extra = options.Parse (arguments); + if (extra.Count == 0) { + if (showHelp) { + return help.Invoke (extra); + } + Out.WriteLine (options.MessageLocalizer ($"Use `{Suite} help` for usage.")); + return 1; + } + var command = Contains (extra [0]) ? this [extra [0]] : null; + if (command == null) { + help.WriteUnknownCommand (extra [0]); + return 1; + } + extra.RemoveAt (0); + if (showHelp) { + if (command.Options?.Contains ("help") ?? true) { + extra.Add ("--help"); + return command.Invoke (extra); + } + command.Options.WriteOptionDescriptions (Out); + return 0; + } + return command.Invoke (extra); + } + } + + public class HelpCommand : Command + { + public HelpCommand () + : base ("help", help: "Show this message and exit") + { + } + + public override int Invoke (IEnumerable arguments) + { + var extra = new List (arguments ?? new string [0]); + var _ = CommandSet.Options.MessageLocalizer; + if (extra.Count == 0) { + CommandSet.Options.WriteOptionDescriptions (CommandSet.Out); + return 0; + } + var command = CommandSet.Contains (extra [0]) + ? CommandSet [extra [0]] + : null; + if (command == this || extra [0] == "--help") { + CommandSet.Out.WriteLine (_ ($"Usage: {CommandSet.Suite} COMMAND [OPTIONS]")); + CommandSet.Out.WriteLine (_ ($"Use `{CommandSet.Suite} help COMMAND` for help on a specific command.")); + CommandSet.Out.WriteLine (); + CommandSet.Out.WriteLine (_ ($"Available commands:")); + CommandSet.Out.WriteLine (); + foreach (var c in CommandSet) { + CommandSet.Options.WriteCommandDescription (CommandSet.Out, c); + } + return 0; + } + if (command == null) { + WriteUnknownCommand (extra [0]); + return 1; + } + if (command.Options != null) { + command.Options.WriteOptionDescriptions (CommandSet.Out); + return 0; + } + return command.Invoke (new [] { "--help" }); + } + + internal void WriteUnknownCommand (string unknownCommand) + { + CommandSet.Error.WriteLine (CommandSet.Options.MessageLocalizer ($"{CommandSet.Suite}: Unknown command: {unknownCommand}")); + CommandSet.Error.WriteLine (CommandSet.Options.MessageLocalizer ($"{CommandSet.Suite}: Use `{CommandSet.Suite} help` for usage.")); + } + } } diff --git a/mcs/class/Mono.Options/Mono.Options_test.dll.sources b/mcs/class/Mono.Options/Mono.Options_test.dll.sources index 686fa1244e..7aa10fc7b9 100644 --- a/mcs/class/Mono.Options/Mono.Options_test.dll.sources +++ b/mcs/class/Mono.Options/Mono.Options_test.dll.sources @@ -1,5 +1,7 @@ Mono.Options/BaseRocksFixture.cs Mono.Options/CollectionContract.cs +Mono.Options/CommandTest.cs +Mono.Options/CommandSetTest.cs Mono.Options/ListContract.cs Mono.Options/OptionContextTest.cs Mono.Options/OptionSetTest.cs diff --git a/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs new file mode 100644 index 0000000000..a195e43a80 --- /dev/null +++ b/mcs/class/Mono.Options/Test/Mono.Options/CommandSetTest.cs @@ -0,0 +1,249 @@ +// +// CommandSetTest.cs +// +// Authors: +// Jonathan Pryor +// +// Copyright (C) 2017 Microsoft (http://www.microsoft.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Globalization; +using System.IO; +using System.Linq; + +#if NDESK_OPTIONS +using NDesk.Options; +#else +using Mono.Options; +#endif + +using Cadenza.Collections.Tests; + +using NUnit.Framework; + +#if NDESK_OPTIONS +namespace Tests.NDesk.Options +#else +namespace MonoTests.Mono.Options +#endif +{ + [TestFixture] + public class CommandSetTest : ListContract + { + protected override ICollection CreateCollection (IEnumerable values) + { + var set = new CommandSet ("test"); + foreach (var value in values) + set.Add (value); + return set; + } + + protected override Command CreateValueA () + { + return new Command ( + "foo", + "foo help"); + } + + protected override Command CreateValueB () + { + return new Command ( + "bar", + "bar help"); + } + + protected override Command CreateValueC () + { + return new Command ( + "baz", + "baz help"); + } + + static IEnumerable _ (params string [] a) + { + return a; + } + + [Test] + public void Constructor_SuiteRequired () + { + Assert.Throws (() => new CommandSet (null)); + } + + [Test] + public void Add_NullCommand () + { + var c = new CommandSet ("cs"); + Assert.Throws (() => c.Add ((Command)null)); + } + + [Test] + public void Add_CommandCanBeAddedToOnlyOneSet () + { + var cs1 = new CommandSet ("cs1"); + var cs2 = new CommandSet ("cs2"); + var c = new Command ("command", "help"); + cs1.Add (c); + Assert.Throws (() => cs2.Add (c)); + } + + [Test] + public void Add_SetsCommandSet () + { + var cs = new CommandSet ("cs"); + var c = new Command ("command"); + Assert.IsNull (c.CommandSet); + cs.Add (c); + Assert.AreSame (cs, c.CommandSet); + } + + [Test] + public void Add_DuplicateCommand () + { + var s = new CommandSet ("set"); + s.Add (new Command ("value")); + Assert.Throws (() => s.Add (new Command ("value"))); + } + + [Test] + public void Run_Help () + { + var o = new StringWriter (); + var e = new StringWriter (); + + var showVersion = false; + var showHelp = false; + + var git = new CommandSet ("git", output: o, error: e) { + "usage: git [--version] ... []", + "", + "Common Options:", + { "version", + "show version info", + v => showVersion = v != null }, + { "help", + "show this message and exit", + v => showHelp = v != null }, + "", + "These are common Git commands used in various situations:", + "", + "start a working area (see also: git help tutorial)", + new Command ("clone", "Clone a repository into a new directory"), + new Command ("init", "Create an empty Git repository or reinitialize an existing one"), + new Command ("thisIsAVeryLongCommandNameInOrderToInduceWrapping", "Create an empty Git repository or reinitialize an existing one. Let's make this really long to cause a line wrap, shall we?"), + }; + + var expectedHelp = new StringWriter (); + + expectedHelp.WriteLine ("usage: git [--version] ... []"); + expectedHelp.WriteLine (""); + expectedHelp.WriteLine ("Common Options:"); + expectedHelp.WriteLine (" --version show version info"); + expectedHelp.WriteLine (" --help show this message and exit"); + expectedHelp.WriteLine (""); + expectedHelp.WriteLine ("These are common Git commands used in various situations:"); + expectedHelp.WriteLine (""); + expectedHelp.WriteLine ("start a working area (see also: git help tutorial)"); + expectedHelp.WriteLine (" clone Clone a repository into a new directory"); + expectedHelp.WriteLine (" init Create an empty Git repository or reinitialize an"); + expectedHelp.WriteLine (" existing one"); + expectedHelp.WriteLine (" thisIsAVeryLongCommandNameInOrderToInduceWrapping"); + expectedHelp.WriteLine (" Create an empty Git repository or reinitialize an"); + expectedHelp.WriteLine (" existing one. Let's make this really long to"); + expectedHelp.WriteLine (" cause a line wrap, shall we?"); + + Assert.AreEqual (0, git.Run (new [] { "help" })); + Assert.AreEqual (expectedHelp.ToString (), o.ToString ()); + + var expectedHelpHelp = new StringWriter (); + expectedHelpHelp.WriteLine ("Usage: git COMMAND [OPTIONS]"); + expectedHelpHelp.WriteLine ("Use `git help COMMAND` for help on a specific command."); + expectedHelpHelp.WriteLine (); + expectedHelpHelp.WriteLine ("Available commands:"); + expectedHelpHelp.WriteLine (); + expectedHelpHelp.WriteLine (" clone Clone a repository into a new directory"); + expectedHelpHelp.WriteLine (" init Create an empty Git repository or reinitialize an"); + expectedHelpHelp.WriteLine (" existing one"); + expectedHelpHelp.WriteLine (" thisIsAVeryLongCommandNameInOrderToInduceWrapping"); + expectedHelpHelp.WriteLine (" Create an empty Git repository or reinitialize an"); + expectedHelpHelp.WriteLine (" existing one. Let's make this really long to"); + expectedHelpHelp.WriteLine (" cause a line wrap, shall we?"); + expectedHelpHelp.WriteLine (" help Show this message and exit"); + + o.GetStringBuilder ().Clear (); + Assert.AreEqual (0, git.Run (new [] { "help", "--help" })); + Assert.AreEqual (expectedHelpHelp.ToString (), o.ToString ()); + } + + [Test] + public void Run_Command () + { + var a = 0; + var b = 0; + var c = new CommandSet ("set") { + new Command ("a") { Run = v => a = v.Count () }, + new Command ("b") { Run = v => b = v.Count () }, + }; + Assert.AreEqual (0, c.Run (new [] { "a", "extra" })); + Assert.AreEqual (1, a); + Assert.AreEqual (0, b); + + a = b = 0; + Assert.AreEqual (0, c.Run (new [] { "b" })); + Assert.AreEqual (0, a); + Assert.AreEqual (0, b); + + Assert.AreEqual (0, c.Run (new [] { "b", "one", "two" })); + Assert.AreEqual (0, a); + Assert.AreEqual (2, b); + } + + [Test] + public void Run_HelpCommandSendsHelpOption () + { + var e = new Command ("echo"); + e.Run = (args) => e.CommandSet.Out.WriteLine (string.Join (" ", args)); + + var o = new StringWriter (); + var c = new CommandSet ("set", output:o) { + e, + }; + Assert.AreEqual (0, c.Run (new [] { "help", "echo" })); + + var expected = $"--help{Environment.NewLine}"; + var actual = o.ToString (); + Assert.AreEqual (expected, actual); + } + + [Test] + public void Run_NullArgument () + { + var c = new CommandSet ("c"); + Assert.Throws (() => c.Run (null)); + } + } +} + diff --git a/mcs/class/Mono.Options/Test/Mono.Options/CommandTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/CommandTest.cs new file mode 100644 index 0000000000..5805f280c3 --- /dev/null +++ b/mcs/class/Mono.Options/Test/Mono.Options/CommandTest.cs @@ -0,0 +1,102 @@ +// +// CommandSetTest.cs +// +// Authors: +// Jonathan Pryor +// +// Copyright (C) 2017 Microsoft (http://www.microsoft.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Globalization; +using System.IO; +using System.Linq; + +#if NDESK_OPTIONS +using NDesk.Options; +#else +using Mono.Options; +#endif + +using Cadenza.Collections.Tests; + +using NUnit.Framework; + +#if NDESK_OPTIONS +namespace Tests.NDesk.Options +#else +namespace MonoTests.Mono.Options +#endif +{ + [TestFixture] + public class CommandTest + { + [Test] + public void Constructor_NameRequired () + { + Assert.Throws (() => new Command (name: null, help: null)); + } + + [Test] + public void Constructor () + { + var c = new Command ("command", "help"); + Assert.AreEqual ("command", c.Name); + Assert.AreEqual ("help", c.Help); + } + + [Test] + public void Invoke_CallsRun () + { + bool runInvoked = false; + var c = new Command ("command") { + Run = v => runInvoked = true, + }; + Assert.AreEqual (0, c.Invoke (null)); + Assert.IsTrue (runInvoked); + } + + [Test] + public void Invoke_RequiresNothing () + { + var c = new Command ("c"); + Assert.AreEqual (0, c.Invoke (null)); + } + + [Test] + public void Invoke_UsesOptions () + { + bool showHelp = false; + var c = new Command ("c") { + Options = new OptionSet { + { "help", v => showHelp = v != null }, + }, + }; + Assert.AreEqual (0, c.Invoke (new [] { "--help" })); + Assert.IsTrue (showHelp); + } + } +} + diff --git a/mcs/class/Mono.Posix/Mono.Unix.Android/AndroidUtils.cs b/mcs/class/Mono.Posix/Mono.Unix.Android/AndroidUtils.cs new file mode 100644 index 0000000000..3b40a82c07 --- /dev/null +++ b/mcs/class/Mono.Posix/Mono.Unix.Android/AndroidUtils.cs @@ -0,0 +1,47 @@ +using System; +using System.Reflection; + +// using Android.Runtime; +// using Android.Util; + +namespace Mono.Unix.Android +{ + internal sealed class AndroidUtils + { + const string TAG = "Mono.Posix"; + + delegate void DetectCPUAndArchitecture (out ushort builtForCPU, out ushort runningOnCPU, out bool is64bit); + + readonly static DetectCPUAndArchitecture detectCPUAndArchitecture; + + static AndroidUtils () + { + Type androidRuntime = Type.GetType ("Android.Runtime.AndroidEnvironment, Mono.Android", true); + + MethodInfo mi = androidRuntime.GetMethod ("DetectCPUAndArchitecture", BindingFlags.NonPublic | BindingFlags.Static); + detectCPUAndArchitecture = (DetectCPUAndArchitecture) Delegate.CreateDelegate (typeof(DetectCPUAndArchitecture), mi); + } + + public static bool AreRealTimeSignalsSafe () + { + ushort built_for_cpu; + ushort running_on_cpu; + bool is64bit; + + detectCPUAndArchitecture (out built_for_cpu, out running_on_cpu, out is64bit); + + // CPUArchitecture builtForCPU = Enum.IsDefined (typeof (CPUArchitecture), built_for_cpu) ? (CPUArchitecture)built_for_cpu : CPUArchitecture.Unknown; + // CPUArchitecture runningOnCPU = Enum.IsDefined (typeof (CPUArchitecture), running_on_cpu) ? (CPUArchitecture)running_on_cpu : CPUArchitecture.Unknown; + + // Log.Info (TAG, " Built for CPU: {0}", builtForCPU); + // Log.Info (TAG, "Running on CPU: {0}", runningOnCPU); + // Log.Info (TAG, "64-bit process: {0}", is64bit ? "yes" : "no"); + + // For now real-time signals aren't safe at all, alas + bool safe = false; + // Log.Info (TAG, "Real-time signals are {0}safe on this platform", safe ? String.Empty : "not "); + + return safe; + } + } +} \ No newline at end of file diff --git a/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.cs b/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.cs index 57c0314011..810e13a7ca 100644 --- a/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.cs +++ b/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.cs @@ -8,6 +8,9 @@ using System; using System.IO; using System.Runtime.InteropServices; using Mono.Unix.Native; +#if MONODROID +using Mono.Unix.Android; +#endif namespace Mono.Unix.Native { @@ -17,7 +20,17 @@ namespace Mono.Unix.Native { // // Non-generated exports // -#if !MONODROID +#if MONODROID + [DllImport (LIB, EntryPoint="Mono_Posix_FromRealTimeSignum")] + static extern int HelperFromRealTimeSignum (Int32 offset, out Int32 rval); + + static int FromRealTimeSignum (Int32 offset, out Int32 rval) + { + if (!AndroidUtils.AreRealTimeSignalsSafe ()) + throw new PlatformNotSupportedException ("Real-time signals are not supported on this Android architecture"); + return HelperFromRealTimeSignum (offset, out rval); + } +#else [DllImport (LIB, EntryPoint="Mono_Posix_FromRealTimeSignum")] private static extern int FromRealTimeSignum (Int32 offset, out Int32 rval); #endif diff --git a/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs b/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs index 9b95fba6f3..dbabb29c7f 100644 --- a/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs +++ b/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs @@ -426,14 +426,20 @@ namespace Mono.Unix.Native { public static Errno GetLastError () { + // Always call Marshal.GetLastWin32Error() before the OS check, + // even on Windows where we don't use the return value. If we do + // the OS check first Environment.OSVersion (if it happens to be + // the first ever access) will clobber Marshal.GetLastWin32Error() + // and we won't get the desired errno value on non-Windows platforms. + int errno = Marshal.GetLastWin32Error (); if (Environment.OSVersion.Platform != PlatformID.Unix) { // On Windows Marshal.GetLastWin32Error() doesn't take errno // into account so we need to call Mono_Posix_Stdlib_GetLastError() // which returns the value of errno in the C runtime // libMonoPosixHelper.dll was linked against. - return (Errno) _GetLastError (); + errno = _GetLastError (); } - return NativeConvert.ToErrno (Marshal.GetLastWin32Error ()); + return NativeConvert.ToErrno (errno); } [DllImport (MPH, CallingConvention=CallingConvention.Cdecl, diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs index ee28ffdee4..39d25ca11a 100644 --- a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs +++ b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs @@ -188,6 +188,8 @@ namespace Mono.Unix { AssertValid (); if (exitContext) throw new InvalidOperationException ("exitContext is not supported"); + if (millisecondsTimeout == 0) + return IsSet; return WaitAny (new UnixSignal[]{this}, millisecondsTimeout) == 0; } #endregion diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix.dll.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix.dll.sources new file mode 100644 index 0000000000..0d242e6ef3 --- /dev/null +++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix.dll.sources @@ -0,0 +1,2 @@ +#include Mono.Posix.dll.sources +./Mono.Unix.Android/AndroidUtils.cs diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs index 7721bb00a5..f8b9209620 100644 --- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs +++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs @@ -75,6 +75,10 @@ namespace Mono.Security.Interface get; set; } + internal string[] CertificateSearchPaths { + get; set; + } + /* * If you set this here, then it will override 'ServicePointManager.SecurityProtocol'. */ @@ -161,7 +165,13 @@ namespace Mono.Security.Interface UserSettings = other.UserSettings; EnabledProtocols = other.EnabledProtocols; EnabledCiphers = other.EnabledCiphers; - TrustAnchors = other.TrustAnchors; + if (other.TrustAnchors != null) + TrustAnchors = new X509CertificateCollection (other.TrustAnchors); + if (other.CertificateSearchPaths != null) { + CertificateSearchPaths = new string [other.CertificateSearchPaths.Length]; + other.CertificateSearchPaths.CopyTo (CertificateSearchPaths, 0); + } + cloned = true; } diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector16b.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector16b.cs index e626959aa1..f6eb089e95 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector16b.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector16b.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 16)] public struct Vector16b { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector16sb.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector16sb.cs index e0dc37effe..58395987ca 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector16sb.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector16sb.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 16)] [CLSCompliant(false)] public struct Vector16sb diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector2d.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector2d.cs index 9c57b79392..59f0bb7538 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector2d.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector2d.cs @@ -30,7 +30,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { - + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] public struct Vector2d { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector2l.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector2l.cs index 0e5a1d80e2..a08d06d14e 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector2l.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector2l.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] public struct Vector2l { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector2ul.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector2ul.cs index de273f596b..25de9047d5 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector2ul.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector2ul.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] [CLSCompliant(false)] public struct Vector2ul diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector4f.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector4f.cs index db7143b9b4..e018f92e68 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector4f.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector4f.cs @@ -84,6 +84,7 @@ namespace Mono.Simd Replace Shuffle with less bug prone methods */ + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] public struct Vector4f { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector4i.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector4i.cs index aa5ee39d69..1df6171b41 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector4i.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector4i.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] public struct Vector4i { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector4ui.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector4ui.cs index c62365c61a..b961987a5e 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector4ui.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector4ui.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] [CLSCompliant(false)] public struct Vector4ui diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector8s.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector8s.cs index be178470a8..1008c20920 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector8s.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector8s.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] public struct Vector8s { diff --git a/mcs/class/Mono.Simd/Mono.Simd/Vector8us.cs b/mcs/class/Mono.Simd/Mono.Simd/Vector8us.cs index 2c9afd33c0..0aa16ee49a 100644 --- a/mcs/class/Mono.Simd/Mono.Simd/Vector8us.cs +++ b/mcs/class/Mono.Simd/Mono.Simd/Vector8us.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; namespace Mono.Simd { + [Obsolete ("Use the types in the System.Numerics.Vectors namespace")] [StructLayout(LayoutKind.Explicit, Pack = 0, Size = 16)] [CLSCompliant(false)] public struct Vector8us diff --git a/mcs/class/README b/mcs/class/README index efebe9ad5a..421c04da2b 100644 --- a/mcs/class/README +++ b/mcs/class/README @@ -134,7 +134,7 @@ testing. code (); } - * Avoid using unecessary open/close braces, vertical space + * Avoid using unnecessary open/close braces, vertical space is usually limited: good: diff --git a/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs b/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs index c642a6ce5b..db86289ba1 100644 --- a/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs +++ b/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs @@ -56,9 +56,9 @@ namespace System.Configuration.Internal return host.CreateDeprecatedConfigContext (configPath); } - public virtual string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection) + public virtual string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection) { - return host.DecryptSection (encryptedXml, protectionProvider, protectedSection); + return host.DecryptSection (encryptedXml, protectionProvider, protectedConfigSection); } public virtual void DeleteStream (string streamName) @@ -66,14 +66,14 @@ namespace System.Configuration.Internal host.DeleteStream (streamName); } - public virtual string EncryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection) + public virtual string EncryptSection (string clearTextXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection) { - return host.EncryptSection (encryptedXml, protectionProvider, protectedSection); + return host.EncryptSection (clearTextXml, protectionProvider, protectedConfigSection); } - public virtual string GetConfigPathFromLocationSubPath (string configPath, string locatinSubPath) + public virtual string GetConfigPathFromLocationSubPath (string configPath, string locationSubPath) { - return host.GetConfigPathFromLocationSubPath (configPath, locatinSubPath); + return host.GetConfigPathFromLocationSubPath (configPath, locationSubPath); } public virtual Type GetConfigType (string typeName, bool throwOnError) @@ -111,14 +111,14 @@ namespace System.Configuration.Internal return host.Impersonate (); } - public virtual void Init (IInternalConfigRoot root, params object[] hostInitParams) + public virtual void Init (IInternalConfigRoot configRoot, params object[] hostInitParams) { - host.Init (root, hostInitParams); + host.Init (configRoot, hostInitParams); } - public virtual void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot root, params object[] hostInitConfigurationParams) + public virtual void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot configRoot, params object[] hostInitConfigurationParams) { - host.InitForConfiguration (ref locationSubPath, out configPath, out locationConfigPath, root, hostInitConfigurationParams); + host.InitForConfiguration (ref locationSubPath, out configPath, out locationConfigPath, configRoot, hostInitConfigurationParams); } public virtual bool IsAboveApplication (string configPath) diff --git a/mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigHost.cs b/mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigHost.cs index 2cde5e60c7..0445508661 100644 --- a/mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigHost.cs +++ b/mcs/class/System.Configuration/System.Configuration.Internal/IInternalConfigHost.cs @@ -38,10 +38,10 @@ namespace System.Configuration.Internal { object CreateConfigurationContext (string configPath, string locationSubPath); object CreateDeprecatedConfigContext (string configPath); - string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection); + string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection); void DeleteStream (string streamName); - string EncryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection); - string GetConfigPathFromLocationSubPath (string configPath, string locatinSubPath); + string EncryptSection (string clearTextXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection); + string GetConfigPathFromLocationSubPath (string configPath, string locationSubPath); Type GetConfigType (string typeName, bool throwOnError); string GetConfigTypeName (Type t); void GetRestrictedPermissions (IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady); @@ -49,8 +49,8 @@ namespace System.Configuration.Internal string GetStreamNameForConfigSource (string streamName, string configSource); object GetStreamVersion (string streamName); IDisposable Impersonate (); - void Init (IInternalConfigRoot root, params object[] hostInitParams); - void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot root, params object[] hostInitConfigurationParams); + void Init (IInternalConfigRoot configRoot, params object[] hostInitParams); + void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot configRoot, params object[] hostInitConfigurationParams); bool IsAboveApplication (string configPath); bool IsConfigRecordRequired (string configPath); bool IsDefinitionAllowed (string configPath, ConfigurationAllowDefinition allowDefinition, ConfigurationAllowExeDefinition allowExeDefinition); diff --git a/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs b/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs index 9badcd34af..65b63cdee8 100644 --- a/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs +++ b/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs @@ -95,10 +95,10 @@ namespace System.Configuration { [MonoTODO] protected internal override string SerializeSection ( - ConfigurationElement parent, string name, ConfigurationSaveMode mode) + ConfigurationElement parentElement, string name, ConfigurationSaveMode saveMode) { if (File == "") { - return base.SerializeSection (parent, name, mode); + return base.SerializeSection (parentElement, name, saveMode); } else { throw new NotImplementedException (); diff --git a/mcs/class/System.Configuration/System.Configuration/Configuration.cs b/mcs/class/System.Configuration/System.Configuration/Configuration.cs index fb48cc9664..7e78b1b325 100644 --- a/mcs/class/System.Configuration/System.Configuration/Configuration.cs +++ b/mcs/class/System.Configuration/System.Configuration/Configuration.cs @@ -251,9 +251,9 @@ namespace System.Configuration { get { return RootSectionGroup.Sections; } } - public ConfigurationSection GetSection (string path) + public ConfigurationSection GetSection (string sectionName) { - string[] parts = path.Split ('/'); + string[] parts = sectionName.Split ('/'); if (parts.Length == 1) return Sections [parts[0]]; @@ -267,9 +267,9 @@ namespace System.Configuration { return null; } - public ConfigurationSectionGroup GetSectionGroup (string path) + public ConfigurationSectionGroup GetSectionGroup (string sectionGroupName) { - string[] parts = path.Split ('/'); + string[] parts = sectionGroupName.Split ('/'); ConfigurationSectionGroup group = SectionGroups [parts[0]]; for (int n=1; group != null && n> 3); } - public override ICryptoTransform CreateDecryptor (byte[] rgbKey, byte[] rgbIV) + public override ICryptoTransform CreateDecryptor (byte[] key, byte[] iv) { if ((Mode == CipherMode.CFB) && (FeedbackSize > 64)) throw new CryptographicException ("CFB with Feedbaack > 64 bits"); - return new AesTransform (this, false, rgbKey, rgbIV); + return new AesTransform (this, false, key, iv); } - public override ICryptoTransform CreateEncryptor (byte[] rgbKey, byte[] rgbIV) + public override ICryptoTransform CreateEncryptor (byte[] key, byte[] iv) { if ((Mode == CipherMode.CFB) && (FeedbackSize > 64)) throw new CryptographicException ("CFB with Feedbaack > 64 bits"); - return new AesTransform (this, true, rgbKey, rgbIV); + return new AesTransform (this, true, key, iv); } // I suppose some attributes differs ?!? because this does not look required diff --git a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs index 9c273b84a5..c192c397fa 100644 --- a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs +++ b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs @@ -451,5 +451,20 @@ namespace MonoTests.System.IO.MemoryMappedFiles { } } + [Test] + public void OpenSameFileMultipleTimes () + { + // See bug 56493 - https://bugzilla.xamarin.com/show_bug.cgi?id=56493 + for (var iteration = 0; iteration < 5; iteration++) { + using (var mmf = MemoryMappedFile.CreateFromFile(fname, FileMode.Open)) { + using (var accessor = mmf.CreateViewAccessor(0, 5)) { + var a = new byte [5]; + accessor.ReadArray (0, a, 0, a.Length); + var s = new string (Array.ConvertAll (a, b => (char) b)); + Assert.AreEqual ("Hello", s); + } + } + } + } } } diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources index 8ffd53dc95..9e54bcb3f7 100644 --- a/mcs/class/System.Core/common_System.Core.dll.sources +++ b/mcs/class/System.Core/common_System.Core.dll.sources @@ -49,11 +49,6 @@ corefx/SR.missing.cs ../referencesource/System.Core/System/TimeZoneInfo.cs ../referencesource/System.Core/System/TimeZoneNotFoundException.cs -../referencesource/System.Core/System/Collections/Generic/BitHelper.cs -../referencesource/System.Core/System/Collections/Generic/HashSet.cs -../referencesource/System.Core/System/Collections/Generic/HashSetDebugView.cs -../referencesource/System.Core/System/Collections/Generic/HashSetEqualityComparer.cs - ../referencesource/System.Core/System/IO/Enums.cs ../referencesource/System.Core/System/IO/MemoryMappedFiles/Enums.cs @@ -93,6 +88,12 @@ System.Security.Cryptography/SHA256CryptoServiceProvider.cs System.Security.Cryptography/SHA384CryptoServiceProvider.cs System.Security.Cryptography/SHA512CryptoServiceProvider.cs +../referencesource/System.Core/System/Security/Cryptography/X509Certificates/TrustStatus.cs + +../../../external/corefx/src/System.Collections/src/System/Collections/Generic/BitHelper.cs +../../../external/corefx/src/System.Collections/src/System/Collections/Generic/HashSet.cs +../../../external/corefx/src/System.Collections/src/System/Collections/Generic/HashSetEqualityComparer.cs +../../../external/corefx/src/System.Collections/src/System/Collections/Generic/ICollectionDebugView.cs ../../../external/corefx/src/System.Linq/src/System/Linq/*.cs @@ -123,7 +124,6 @@ System.Security.Cryptography/SHA512CryptoServiceProvider.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/IRuntimeVariables.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/ReadOnlyCollectionBuilder.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuleCache.cs -../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.ExpressionQuoter.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.RuntimeVariableList.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.MergedRuntimeVariables.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.RuntimeVariables.cs diff --git a/mcs/class/System.Core/dynamic_System.Core.dll.sources b/mcs/class/System.Core/dynamic_System.Core.dll.sources index 7336284054..7dc4225130 100644 --- a/mcs/class/System.Core/dynamic_System.Core.dll.sources +++ b/mcs/class/System.Core/dynamic_System.Core.dll.sources @@ -13,7 +13,7 @@ ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/ILGen.cs -../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/KeyedQueue.cs +../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/KeyedStack.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LabelInfo.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Address.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs @@ -32,3 +32,5 @@ ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.Temps.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs ../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs + +../../../external/corefx/src/System.Linq.Expressions/src/System/Runtime/CompilerServices/RuntimeOps.ExpressionQuoter.cs diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs b/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs index acef0f9047..db68b96777 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/Data/Linq/DataContext.cs @@ -192,12 +192,12 @@ namespace DbLinq.Data.Linq /// /// specifies file or server connection [DbLinqToDo] - public DataContext(string connectionString) + public DataContext(string fileOrServerOrConnection) { Profiler.At("START DataContext(string)"); - IVendor ivendor = GetVendor(ref connectionString); + IVendor ivendor = GetVendor(ref fileOrServerOrConnection); - IDbConnection dbConnection = ivendor.CreateDbConnection(connectionString); + IDbConnection dbConnection = ivendor.CreateDbConnection(fileOrServerOrConnection); Init(new DatabaseContext(dbConnection), null, ivendor); Profiler.At("END DataContext(string)"); diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs index 26fce3ab35..b4467919ce 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs @@ -1,4 +1,4 @@ -// +// // System.Data.OracleClient.OracleCommandBuilder.cs // // based on the SqlCommandBuilder in mcs/class/System.Data/System.Data.SqlClient @@ -490,8 +490,8 @@ namespace System.Data.OracleClient { } [MonoTODO] - protected override void ApplyParameterInfo (DbParameter dbParameter, - DataRow row, + protected override void ApplyParameterInfo (DbParameter parameter, + DataRow datarow, StatementType statementType, bool whereClause) { @@ -499,7 +499,7 @@ namespace System.Data.OracleClient { } [MonoTODO] - protected override string GetParameterName (int position) + protected override string GetParameterName (int parameterOrdinal) { throw new NotImplementedException (); } @@ -511,7 +511,7 @@ namespace System.Data.OracleClient { } [MonoTODO] - protected override string GetParameterPlaceholder (int position) + protected override string GetParameterPlaceholder (int parameterOrdinal) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index c3b746262b..992f970601 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -35,6 +35,9 @@ endif TXT_RESOURCE_STRINGS = ../referencesource/System.Data/system.data.txt +RESX_RESOURCE_STRING = \ + ../../../external/corefx/src/System.Data.Common/src/Resources/Strings.resx + TEST_LIB_REFS = System.Core Mono.Data.Sqlite TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168 @@ -50,6 +53,7 @@ EXTRA_DISTFILES = \ $(wildcard Test/System.Data/schemas/*.xsd) \ Test/test-config-file \ Test/System.Data/binserialize/*.bin \ + Test/ProviderTests/sql/*.sql \ SqliteTest.db \ corefx.common.sources diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.cs index 96cf66caba..87e740495b 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.cs @@ -612,6 +612,30 @@ namespace System.Data.SqlClient { throw new NotImplementedException (); } + [MonoTODO] + public Task WriteToServerAsync (DataRow[] rows) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (DataRow[] rows, CancellationToken cancellationToken) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (IDataReader reader) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (IDataReader reader, CancellationToken cancellationToken) + { + throw new NotImplementedException (); + } + [MonoTODO] public Task WriteToServerAsync (DbDataReader reader) { @@ -624,6 +648,30 @@ namespace System.Data.SqlClient { throw new NotImplementedException (); } + [MonoTODO] + public Task WriteToServerAsync (DataTable table) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (DataTable table, CancellationToken cancellationToken) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (DataTable table, DataRowState rowState) + { + throw new NotImplementedException (); + } + + [MonoTODO] + public Task WriteToServerAsync (DataTable table, DataRowState rowState, CancellationToken cancellationToken) + { + throw new NotImplementedException (); + } + private void RowsCopied (long rowsCopied) { SqlRowsCopiedEventArgs e = new SqlRowsCopiedEventArgs (rowsCopied); diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.platformnotsupported.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.platformnotsupported.cs index 95d6801851..3b5cc3116a 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.platformnotsupported.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopy.platformnotsupported.cs @@ -112,6 +112,26 @@ namespace System.Data.SqlClient { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } + public Task WriteToServerAsync (DataRow[] rows) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (DataRow[] rows, CancellationToken cancellationToken) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (IDataReader reader) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (IDataReader reader, CancellationToken cancellationToken) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + public Task WriteToServerAsync (DbDataReader reader) { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); @@ -122,6 +142,26 @@ namespace System.Data.SqlClient { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } + public Task WriteToServerAsync (DataTable table) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (DataTable table, CancellationToken cancellationToken) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (DataTable table, DataRowState rowState) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + + public Task WriteToServerAsync (DataTable table, DataRowState rowState, CancellationToken cancellationToken) + { + throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); + } + private void RowsCopied (long rowsCopied) { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs index ff5dc821d8..40ccb46eb1 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs @@ -126,10 +126,10 @@ namespace System.Data.SqlClient ConnectionString = connectionString; } - public SqlConnection (string connectionString, SqlCredential cred) + public SqlConnection (string connectionString, SqlCredential credential) { ConnectionString = connectionString; - Credentials = cred; + Credentials = credential; } #endregion // Constructors diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCredential.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCredential.cs index 5b15b48cb6..0bc8068056 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlCredential.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCredential.cs @@ -49,13 +49,13 @@ namespace System.Data.SqlClient { #region Constructors - public SqlCredential (string user, SecureString password) + public SqlCredential (string userId, SecureString password) { - if (user == null) - throw new ArgumentNullException("UserID"); + if (userId == null) + throw new ArgumentNullException("userId"); if (password == null) - throw new ArgumentNullException("Password"); - this.uid = user; + throw new ArgumentNullException("password"); + this.uid = userId; this.pwd = password; } diff --git a/mcs/class/System.Data/System.Data_test.dll.sources b/mcs/class/System.Data/System.Data_test.dll.sources index ab21423450..aa503bf956 100644 --- a/mcs/class/System.Data/System.Data_test.dll.sources +++ b/mcs/class/System.Data/System.Data_test.dll.sources @@ -126,3 +126,29 @@ System.Data.SqlClient/SqlBulkCopyTest.cs Mono.Data.SqlExpressions/DataColumnExpressionTest.cs Mono.Data.SqlExpressions/DateComparisonTest.cs +ProviderTests/Common/ConnectionConfig.cs +ProviderTests/Common/ConnectionManager.cs +ProviderTests/Common/DBHelper.cs +ProviderTests/Common/DataProvider.cs +ProviderTests/Common/EngineConfig.cs +ProviderTests/Common/EngineType.cs +ProviderTests/Common/ProviderTestsConfigurationHandler.cs +ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs +ProviderTests/System.Data.Odbc/OdbcCommandTest.cs +ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs +ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs +ProviderTests/System.Data.Odbc/OdbcParameterTest.cs +ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs +ProviderTests/ProviderIndependant/DataReaderTest.cs +ProviderTests/ProviderIndependant/DbDataReaderTest.cs +ProviderTests/ProviderIndependant/IDbCommandTest.cs +ProviderTests/System.Data.SqlClient/SqlClientFactoryTest.cs +ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs +ProviderTests/System.Data.SqlClient/SqlCommandTest.cs +ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs +ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs +ProviderTests/System.Data.SqlClient/SqlTransactionTest.cs +ProviderTests/System.Data.SqlClient/SqlConnectionStringBuilderTest.cs +ProviderTests/System.Data.SqlClient/SqlConnectionTest.cs +ProviderTests/System.Data.SqlClient/SqlParameterTest.cs +ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs new file mode 100644 index 0000000000..829efab65b --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs @@ -0,0 +1,116 @@ +// +// ConnectionConfig.cs - Holds information on a specific connection and +// corresponding engine to test. +// +// Author: +// Gert Driesen (drieseng@users.sourceforge.net +// +// Copyright (c) 2008 Gert Driesen +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_CONFIGURATION + +using System; +using System.Collections; +using System.Configuration; +using System.Globalization; +using System.Xml; + +namespace MonoTests.System.Data.Connected +{ + internal sealed class ConnectionConfig + { + private readonly string name; + private readonly string factory; + private readonly string connectionString; + private readonly EngineConfig engine; + + private ConnectionConfig (string name, string factory, string connectionString, EngineConfig engine) + { + this.name = name; + this.factory = factory; + this.connectionString = connectionString; + this.engine = engine; + } + + internal static ConnectionConfig FromXml (XmlNode connNode, Hashtable engines) + { + return new ConnectionConfig ( + GetAttribValue (connNode, "name", true), + GetAttribValue (connNode, "factory", true), + GetAttribValue (connNode, "connectionString", true), + GetEngine (connNode, engines)); + } + + public string Name { + get { return name; } + } + + public string Factory { + get { return factory; } + } + + public string ConnectionString { + get { return connectionString; } + } + + public EngineConfig Engine { + get { return engine; } + } + + static string GetAttribValue (XmlNode node, string name, bool required) + { + XmlAttribute attr = node.Attributes [name]; + if (attr == null) { + if (required) + throw CreateAttributeMissingException (name, node); + return null; + } + return attr.Value; + } + + static EngineConfig GetEngine (XmlNode connNode, Hashtable engines) + { + XmlAttribute engineAttr = connNode.Attributes ["engine"]; + if (engineAttr == null) + throw CreateAttributeMissingException ("engine", connNode); + + string engineName = engineAttr.Value; + EngineConfig engine = (EngineConfig) engines [engineName]; + if (engine == null) { + string msg = string.Format (CultureInfo.InvariantCulture, + "Engine '{0}' does not exist.", engineName); + throw new ConfigurationErrorsException (msg, engineAttr); + } + return engine; + } + + static Exception CreateAttributeMissingException (string name, XmlNode node) + { + string msg = string.Format (CultureInfo.InvariantCulture, + "Missing '{0}' attribute.", name); + throw new ConfigurationErrorsException (msg, node); + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs new file mode 100644 index 0000000000..29028c7859 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs @@ -0,0 +1,251 @@ +// ConnectionManager.cs - Singleton ConnectionManager class to manage +// database connections for test cases. +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// +// Copyright Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +#if !NO_ODBC +using System.Data.Odbc; +#endif +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected +{ + public class ConnectionManager + { + private static ConnectionManager instance; + private ConnectionHolder sql; + + private const string OdbcEnvVar = "SYSTEM_DATA_ODBC"; + private const string SqlEnvVar = "SYSTEM_DATA_MSSQL"; + + private ConnectionManager () + { + //Environment.SetEnvironmentVariable(OdbcEnvVar, @"Driver={MySQL ODBC 5.3 Unicode Driver};server=127.0.0.1;uid=sa;pwd=qwerty123;"; + //Environment.SetEnvironmentVariable(SqlEnvVar, @"server=127.0.0.1;database=master;user id=sa;password=qwerty123"; + + // Generate a random db name + DatabaseName = "monotest" + Guid.NewGuid().ToString().Substring(0, 7); + + sql = CreateSqlConfig (SqlEnvVar); + if (sql != null) + CreateMssqlDatabase(); + +#if !NO_ODBC + odbc = CreateOdbcConfig (OdbcEnvVar); + if (odbc != null) + CreateMysqlDatabase(); +#endif + } + + static ConnectionHolder CreateSqlConfig (string envVarName) + { + string connectionString = Environment.GetEnvironmentVariable (envVarName); + if (string.IsNullOrEmpty (connectionString)) + return null; + + SqlConnection connection; +#if MOBILE + connection = new SqlConnection (); +#else + DbProviderFactory factory = DbProviderFactories.GetFactory ("System.Data.SqlClient"); + connection = (SqlConnection)factory.CreateConnection (); +#endif + + var engine = new EngineConfig { + Type = EngineType.SQLServer, + ClientVersion = 9, + QuoteCharacter = """, + SupportsMicroseconds = true, + SupportsUniqueIdentifier = true, + SupportsTimestamp = true, + }; + + return new ConnectionHolder (engine, connection, connectionString); + } + +#if !NO_ODBC + static ConnectionHolder CreateOdbcConfig (string envVarName) + { + string connectionString = Environment.GetEnvironmentVariable (envVarName); + if (string.IsNullOrEmpty (connectionString)) + return null; + + DbProviderFactory factory = DbProviderFactories.GetFactory ("System.Data.Odbc"); + var connection = (OdbcConnection)factory.CreateConnection (); + + var engine = new EngineConfig { + Type = EngineType.MySQL, + QuoteCharacter = "`", + RemovesTrailingSpaces = true, + EmptyBinaryAsNull = true, + SupportsDate = true, + SupportsTime = true + }; + + return new ConnectionHolder (engine, connection, connectionString); + } +#endif + + private void CreateMssqlDatabase() + { + DBHelper.ExecuteNonQuery(sql.Connection, $"CREATE DATABASE [{DatabaseName}]"); + sql.Connection.ChangeDatabase(DatabaseName); + + string query = File.ReadAllText(@"Test/ProviderTests/sql/sqlserver.sql"); + + var queries = SplitSqlStatements(query); + foreach (var subQuery in queries) + { + DBHelper.ExecuteNonQuery(sql.Connection, subQuery); + } + } + +#if !NO_ODBC + private void CreateMysqlDatabase() + { + DBHelper.ExecuteNonQuery(odbc.Connection, $"CREATE DATABASE {DatabaseName}"); + odbc.Connection.ChangeDatabase(DatabaseName); + odbc.ConnectionString += $"database={DatabaseName}"; + + string query = File.ReadAllText("Test/ProviderTests/sql/MySQL_5.sql"); + + var groups = query.Replace("delimiter ", "") + .Split(new[] { "//\n" }, StringSplitOptions.RemoveEmptyEntries); + + foreach (var subQuery in groups[0].Split(new[] { ";" }, StringSplitOptions.RemoveEmptyEntries).Concat(groups.Skip(1))) + { + DBHelper.ExecuteNonQuery(odbc.Connection, subQuery); + } + } +#endif + + private void DropMssqlDatabase() + { + sql.Connection.ChangeDatabase("master"); + string query = $"ALTER DATABASE [{DatabaseName}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;\nDROP DATABASE [{DatabaseName}]"; + DBHelper.ExecuteNonQuery(sql.Connection, query); + } + +#if !NO_ODBC + private void DropMysqlDatabase() + { + string query = $"DROP DATABASE [{DatabaseName}]"; + DBHelper.ExecuteNonQuery(odbc.Connection, query); + } +#endif + + // Split SQL script by "GO" statements + private static IEnumerable SplitSqlStatements(string sqlScript) + { + var statements = Regex.Split(sqlScript, + $@"^[\t ]*GO[\t ]*\d*[\t ]*(?:--.*)?$", + RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace | RegexOptions.IgnoreCase); + return statements.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim(' ', '\r', '\n')); + } + + public static ConnectionManager Instance => instance ?? (instance = new ConnectionManager()); + + public string DatabaseName { get; } + +#if !NO_ODBC + + private ConnectionHolder odbc; + + public ConnectionHolder Odbc + { + get + { + if (odbc == null) + Assert.Ignore($"{OdbcEnvVar} environment variable is not set"); + return odbc; + } + } +#endif + + public ConnectionHolder Sql + { + get + { + if (sql == null) + Assert.Ignore($"{SqlEnvVar} environment variable is not set"); + return sql; + } + } + + public void Close() + { + sql?.CloseConnection(); +#if !NO_ODBC + odbc?.CloseConnection(); +#endif + } + } + + public class ConnectionHolder where TConnection : DbConnection + { + private TConnection connection; + + public EngineConfig EngineConfig { get; } + + public TConnection Connection + { + get + { + if (!(connection.State == ConnectionState.Closed || + connection.State == ConnectionState.Broken)) + connection.Close(); + connection.ConnectionString = ConnectionString; + connection.Open(); + return connection; + } + } + + public void CloseConnection() + { + if (connection != null && connection.State != ConnectionState.Closed) + connection.Close(); + } + + public string ConnectionString { get; set; } + + public ConnectionHolder(EngineConfig engineConfig, TConnection connection, string connectionString) + { + EngineConfig = engineConfig; + this.connection = connection; + ConnectionString = connectionString; + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/DBHelper.cs b/mcs/class/System.Data/Test/ProviderTests/Common/DBHelper.cs new file mode 100644 index 0000000000..4ef4a0b6c4 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/DBHelper.cs @@ -0,0 +1,79 @@ +// DBHelper.cs : Helper class for executing queries with database. +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using System; +using System.Data; +using System.Text; + +namespace MonoTests.System.Data.Connected +{ + public sealed class DBHelper + { + public static Random random = new Random ( (int) DateTime.Now.Ticks); + + public static int ExecuteNonQuery (IDbConnection connection ,string query) + { + IDbCommand command = connection.CreateCommand (); + command.CommandType = CommandType.Text; + command.CommandText = query; + int result = -1; + try { + result = command.ExecuteNonQuery (); + } catch { + return -2; + } + return result; + } + + public static int ExecuteSimpleSP (IDbConnection connection ,string proc) + { + IDbCommand command = connection.CreateCommand (); + command.CommandType = CommandType.StoredProcedure; + command.CommandText = proc; + int result = -1; + try { + result = command.ExecuteNonQuery (); + } catch { + return -2; + } + return result; + } + + public static string GetRandomName (string prefix, int length) + { + StringBuilder s = new StringBuilder (prefix.Length + 1 + length); + s.Append (prefix); + s.Append ("_"); + for (int i = 0; i < length; i++) { + s.Append (random.Next (25) + 'A'); + } + return s.ToString (); + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/DataProvider.cs b/mcs/class/System.Data/Test/ProviderTests/Common/DataProvider.cs new file mode 100644 index 0000000000..2e1550d30b --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/DataProvider.cs @@ -0,0 +1,68 @@ +// +// DataProvider.cs - Holds the data used for Validating Reader Classes +// Author: +// Senganal T (tsenganal@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.SqlClient; + +namespace MonoTests.System.Data.Connected +{ + public class DataProvider + { + private readonly DataSet data; + + // TODO : The Data is now got from the Database. + // Needs to be modified to get the data from a config file + public DataProvider () + { + data = new DataSet (); + string query = "Select * from numeric_family order by id ASC;"; + query += "Select * from string_family order by id ASC;"; + query += "Select * from binary_family order by id ASC;"; + query += "Select * from datetime_family order by id ASC;"; + + SqlDataAdapter adapter = new SqlDataAdapter (query, + ConnectionManager.Instance.Sql.ConnectionString); + adapter.TableMappings.Add ("Table", "numeric_family"); + adapter.TableMappings.Add ("Table1", "string_family"); + adapter.TableMappings.Add ("Table2", "binary_family"); + adapter.TableMappings.Add ("Table3", "datetime_family"); + + data.Tables.Add ("numeric_family"); + data.Tables.Add ("string_family"); + data.Tables.Add ("binary_family"); + data.Tables.Add ("datetime_family"); + adapter.Fill (data); + } + + public DataSet GetDataSet () + { + return data; + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs b/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs new file mode 100644 index 0000000000..6b426124ba --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs @@ -0,0 +1,205 @@ +// +// EngineConfig.cs - Holds information on the capabilities and behavior of an +// RDBMS engine. +// +// Author: +// Gert Driesen (drieseng@users.sourceforge.net +// +// Copyright (c) 2008 Gert Driesen +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Globalization; +using System.Xml; + +namespace MonoTests.System.Data.Connected +{ + public sealed class EngineConfig + { + private string name; + private string quoteCharacter; + private bool removesTrailingSpaces; + private bool emptyBinaryAsNull; + private bool supportsMicroseconds; + private bool supportsUniqueIdentifier; + private bool supportsDate; + private bool supportsTime; + private bool supportsTimestamp; + private EngineType type; + private int clientVersion; + + public EngineConfig () + { + } + + public string Name { + get { return name; } + } + + /// + /// Returns the character(s) for quoting identifiers. + /// + public string QuoteCharacter { + get { return quoteCharacter; } + set { quoteCharacter = value; } + } + + public EngineType Type { + get { return type; } + set { type = value; } + } + + public bool RemovesTrailingSpaces { + get { return removesTrailingSpaces; } + set { removesTrailingSpaces = value; } + } + + public bool EmptyBinaryAsNull { + get { return emptyBinaryAsNull; } + set { emptyBinaryAsNull = value; } + } + + public bool SupportsMicroseconds { + get { return supportsMicroseconds; } + set { supportsMicroseconds = value; } + } + + public bool SupportsUniqueIdentifier { + get { return supportsUniqueIdentifier; } + set { supportsUniqueIdentifier = value; } + } + + public bool SupportsDate { + get { return supportsDate; } + set { supportsDate = value; } + } + + public bool SupportsTime { + get { return supportsTime; } + set { supportsTime = value; } + } + + public bool SupportsTimestamp { + get { return supportsTimestamp; } + set { supportsTimestamp = value; } + } + + public int ClientVersion { + get { return clientVersion; } + set { clientVersion = value; } + } + + public static EngineConfig FromXml (XmlNode config) + { + EngineConfig engine = new EngineConfig (); + engine.name = GetAttribValue (config, "name", true); + engine.quoteCharacter = GetAttribValue (config, "quoteCharacter", true); + engine.removesTrailingSpaces = ParseBoolean (config, "removesTrailingSpaces", false, true); + engine.emptyBinaryAsNull = ParseBoolean (config, "emptyBinaryAsNull", false, true); + engine.supportsMicroseconds = ParseBoolean (config, "supportsMicroseconds", false, true); + engine.supportsUniqueIdentifier = ParseBoolean (config, "supportsUniqueIdentifier", false, true); + engine.supportsDate = ParseBoolean (config, "supportsDate", false, true); + engine.supportsTime = ParseBoolean (config, "supportsTime", false, true); + engine.supportsTimestamp = ParseBoolean (config, "supportsTimestamp", false, true); + engine.type = ParseEngineType (config, "type"); + engine.clientVersion = ParseClientVersion (config, "clientversion"); + return engine; + } + + static string GetAttribValue (XmlNode node, string name, bool required) + { + XmlAttribute attr = node.Attributes [name]; + if (attr == null) { + if (required) + throw CreateAttributeMissingException (name, node); + return null; + } + return attr.Value; + } + + static bool ParseBoolean (XmlNode config, string attrName, bool required, bool defaultValue) + { + XmlAttribute attr = config.Attributes [attrName]; + if (attr == null) { + if (required) + throw CreateAttributeMissingException (attrName, config); + return defaultValue; + } + + string value = attr.Value; + + try { + return bool.Parse (value); + } catch (Exception ex) { + throw CreateInvalidValueException (attrName, + value, attr, ex); + } + } + + static EngineType ParseEngineType (XmlNode config, string attrName) + { + XmlAttribute attr = config.Attributes [attrName]; + if (attr == null) + throw CreateAttributeMissingException (attrName, config); + + string value = attr.Value; + + try { + return (EngineType) Enum.Parse (typeof (EngineType), value); + } catch (Exception ex) { + throw CreateInvalidValueException (attrName, + value, attr, ex); + } + } + + static int ParseClientVersion (XmlNode config, string attrName) + { + XmlAttribute attr = config.Attributes [attrName]; + if (attr == null) + return -1; + + string value = attr.Value; + + try { + return Int32.Parse (value); + } catch (Exception ex) { + throw CreateInvalidValueException (attrName, + value, attr, ex); + } + } + + static Exception CreateInvalidValueException (string name, string value, XmlNode node, Exception cause) + { + string msg = string.Format (CultureInfo.InvariantCulture, + "Invalid value '{0}' for attribute {1}.", + value, name); + throw new ArgumentOutOfRangeException (msg, cause); + } + + static Exception CreateAttributeMissingException (string name, XmlNode node) + { + string msg = string.Format (CultureInfo.InvariantCulture, + "Missing '{0}' attribute.", name); + throw new ArgumentException (msg); + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/EngineType.cs b/mcs/class/System.Data/Test/ProviderTests/Common/EngineType.cs new file mode 100644 index 0000000000..b172d5f25b --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/EngineType.cs @@ -0,0 +1,37 @@ +// EngineType.cs : Defines different database engines supports by the +// provider tests. +// +// Authors: +// Gert Driesen (drieseng@users.sourceforge.net) +// +// Copyright (c) 2008 Gert Driesen +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +namespace MonoTests.System.Data.Connected +{ + public enum EngineType + { + SQLServer = 1, + MySQL = 2, + PostgreSQL = 3 + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs new file mode 100644 index 0000000000..cb3ba28fee --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs @@ -0,0 +1,78 @@ +// +// ProviderTestsConfigurationHandler.cs - Provides access to configuration info +// for the connected System.Data tests. +// +// Author: +// Gert Driesen (drieseng@users.sourceforge.net) +// +// Copyright (c) 2008 Gert Driesen +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_CONFIGURATION + +using System; +using System.Collections; +using System.Configuration; +using System.Globalization; +using System.Text; +using System.Xml; + +namespace MonoTests.System.Data.Connected +{ + class ProviderTestsConfigurationHandler : IConfigurationSectionHandler + { + public object Create (object parent, object configContext, XmlNode section) + { + Hashtable engines = new Hashtable (); + + foreach (XmlNode engineNode in section.SelectNodes ("engines/engine")) { + EngineConfig engine = EngineConfig.FromXml (engineNode); + if (engines.Contains (engine.Name)) { + string msg = string.Format (CultureInfo.InvariantCulture, + "A engine with name '{0}' already exists.", + engine.Name); + throw new ConfigurationErrorsException (msg, engineNode); + } + engines.Add (engine.Name, engine); + } + + Hashtable connections = new Hashtable (); + + foreach (XmlNode connNode in section.SelectNodes ("connections/connection")) { + ConnectionConfig conn = ConnectionConfig.FromXml (connNode, engines); + if (connections.Contains (conn.Name)) { + string msg = string.Format (CultureInfo.InvariantCulture, + "A connection with name '{0}' already exists.", + conn.Name); + throw new ConfigurationErrorsException (msg, connNode); + } + connections.Add (conn.Name, conn); + } + + ConnectionConfig [] c = new ConnectionConfig [connections.Count]; + connections.Values.CopyTo (c, 0); + return c; + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs new file mode 100644 index 0000000000..35d9fdd783 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs @@ -0,0 +1,2639 @@ +// DataReaderTest.cs - NUnit Test Cases for testing the +// DataReader family of classes +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// Gert Driesen (drieseng@users.sourceforge.net) +// Veerapuram Varadhan (vvaradhan@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.SqlTypes; +using System.Globalization; +using System.Text; +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected +{ + [TestFixture] + [Category ("sqlserver")] + public class DataReaderTest + { + static byte [] long_bytes = new byte [] { + 0x00, 0x66, 0x06, 0x66, 0x97, 0x00, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x98}; + + IDbConnection conn; + IDbCommand cmd; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = conn.CreateCommand (); + } + + [TearDown] + public void TearDown () + { + cmd?.Dispose (); + ConnectionManager.Instance.Close(); + } + + [Test] + public void FieldCount () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.AreEqual (6, reader.FieldCount); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void FieldCount_Command_Disposed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + cmd.Dispose (); + Assert.AreEqual (6, reader.FieldCount); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void FieldCount_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + reader.Close (); + try { + int fieldcount = reader.FieldCount; + Assert.Fail ("#1:" + fieldcount); + } catch (InvalidOperationException ex) { + // Invalid attempt to FieldCount when + // reader is closed + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetChars_Index_Invalid () + { + //Console.WriteLine ("In GetChars_Index_Invalid - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + Assert.IsTrue (rdr.Read ()); + + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + rdr.GetChars (1, 0, (char []) null, 0, 0); + Assert.Fail ("#B1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } + + //Console.WriteLine ("In GetChars_Index_Invalid - second_executereader"); + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (rdr.Read ()); + + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#C1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + } + + try { + rdr.GetChars (1, 0, (char []) null, 0, 0); + Assert.Fail ("#D1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#D2"); + Assert.IsNull (ex.InnerException, "#D3"); + Assert.IsNotNull (ex.Message, "#D4"); + } + } + } + + [Test] + public void GetChars_Reader_Closed () + { + //Console.WriteLine ("GetChars_Reader_Closed - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + Assert.IsTrue (rdr.Read ()); + rdr.Close (); + + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + } + + //Console.WriteLine ("GetChars_Reader_Closed - second_executereader"); + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (rdr.Read ()); + rdr.Close (); + + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } + } + + [Test] + [Category("NotWorking")] + public void GetChars_Reader_NoData () + { + //Console.WriteLine ("GetChars_Reader_NoData - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 666"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // No data exists for the row/column + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsFalse (rdr.Read (), "#B"); + + try { + rdr.GetChars (-1, 0, (char []) null, 0, 0); + Assert.Fail ("#C1"); + } catch (IndexOutOfRangeException ex) { + // No data exists for the row/column + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + } + } + } + + [Test] + public void GetDataTypeName () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + + switch (ConnectionManager.Instance.Sql.EngineConfig.Type) { + case EngineType.SQLServer: + Assert.AreEqual ("int", reader.GetDataTypeName (0), "#1"); + break; + case EngineType.MySQL: + Assert.AreEqual ("integer", reader.GetDataTypeName (0), "#1"); + break; + default: + Assert.Fail ("Engine type not supported."); + break; + } + Assert.AreEqual ("varchar", reader.GetDataTypeName (1), "#2"); + Assert.AreEqual ("varchar", reader.GetDataTypeName (2), "#3"); + Assert.AreEqual ("datetime", reader.GetDataTypeName (3), "#4"); + Assert.AreEqual ("datetime", reader.GetDataTypeName (4), "#5"); + Assert.AreEqual ("varchar", reader.GetDataTypeName (5), "#6"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetDataTypeName_Index_Invalid () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + + try { + reader.GetDataTypeName (-1); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + reader.GetDataTypeName (6); + Assert.Fail ("#B1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetDataTypeName_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + reader.Close (); + + try { + reader.GetDataTypeName (0); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetFieldType () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.AreEqual (typeof (int), reader.GetFieldType (0), "#1"); + Assert.AreEqual (typeof (string), reader.GetFieldType (2), "#2"); + Assert.AreEqual (typeof (DateTime), reader.GetFieldType (4), "#3"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetFieldType_Index_Invalid () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + try { + reader.GetFieldType (-1); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + reader.GetFieldType (6); + Assert.Fail ("#B1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetFieldType_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + reader.Close (); + try { + reader.GetFieldType (0); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetName () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.AreEqual ("id", reader.GetName (0), "#1"); + Assert.AreEqual ("fname", reader.GetName (1), "#2"); + Assert.AreEqual ("lname", reader.GetName (2), "#3"); + Assert.AreEqual ("dob", reader.GetName (3), "#4"); + Assert.AreEqual ("doj", reader.GetName (4), "#5"); + Assert.AreEqual ("email", reader.GetName (5), "#6"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetName_Index_Invalid () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + try { + reader.GetName (-1); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + reader.GetName (6); + Assert.Fail ("#B1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetName_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + reader.Close (); + try { + reader.GetName (0); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetOrdinal () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.AreEqual (0, reader.GetOrdinal ("id"), "#1"); + Assert.AreEqual (1, reader.GetOrdinal ("fname"), "#2"); + Assert.AreEqual (2, reader.GetOrdinal ("lname"), "#3"); + Assert.AreEqual (3, reader.GetOrdinal ("doB"), "#4"); + Assert.AreEqual (4, reader.GetOrdinal ("doj"), "#5"); + Assert.AreEqual (5, reader.GetOrdinal ("EmaiL"), "#6"); + Assert.AreEqual (0, reader.GetOrdinal ("iD"), "#7"); + Assert.AreEqual (5, reader.GetOrdinal ("eMail"), "#8"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetOrdinal_Name_NotFound () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + try { + reader.GetOrdinal ("non_existing_column"); + Assert.Fail ("#A1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + reader.GetOrdinal (string.Empty); + Assert.Fail ("#B1"); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetOrdinal_Name_Null () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + try { + reader.GetOrdinal (null); + Assert.Fail ("#1"); + } catch (ArgumentNullException ex) { + Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.AreEqual ("fieldName", ex.ParamName, "#5"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetOrdinal_Reader_Closed () + { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + rdr.Close (); + + try { + rdr.GetOrdinal (null); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + } + } + + [Test] + public void GetOrdinal_Reader_NoData () + { + cmd.CommandText = "SELECT * FROM employee WHERE id = 666"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + Assert.AreEqual (0, rdr.GetOrdinal ("id"), "#A1"); + Assert.AreEqual (5, rdr.GetOrdinal ("eMail"), "#A2"); + + Assert.IsFalse (rdr.Read (), "#B"); + + Assert.AreEqual (2, rdr.GetOrdinal ("lname"), "#C1"); + Assert.AreEqual (3, rdr.GetOrdinal ("dob"), "#C2"); + } + } + + [Test] + public void GetSchemaTable_Command_Disposed () + { + if (RunningOnMono) + Assert.Ignore ("Our statement handle is closed when we dispose the (Odbc)Command"); + + IDataReader reader = null; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + cmd.Dispose (); + DataTable schema = reader.GetSchemaTable (); + Assert.AreEqual (3, schema.Rows.Count, "RowCount"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetSchemaTable_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + reader.Close (); + + try { + reader.GetSchemaTable (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // Invalid attempt to call GetSchemaTable + // when reader is closed + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void GetNameTest () + { + cmd.CommandText = "SELECT type_tinyint from numeric_family"; ; + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.AreEqual ("type_tinyint", reader.GetName (0), "#1"); + } + } + + [Test] // this [Int32] + public void Indexer1 () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.IsTrue (reader.Read ()); + Assert.AreEqual (1, reader [0], "#0"); + Assert.AreEqual ("suresh", reader [1], "#1"); + Assert.AreEqual ("kumar", reader [2], "#2"); + Assert.AreEqual (new DateTime (1978, 8, 22), reader [3], "#3"); + Assert.AreEqual (new DateTime (2001, 3, 12), reader [4], "#4"); + Assert.AreEqual ("suresh@gmail.com", reader [5], "#5"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [Int32] + public void Indexer1_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee"; + reader = cmd.ExecuteReader (); + reader.Read (); + reader.Close (); + + try { + object value = reader [0]; + Assert.Fail ("#A1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + reader = cmd.ExecuteReader (); + reader.Close (); + + try { + object value = reader [0]; + Assert.Fail ("#B1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [Int32] + public void Indexer1_Reader_NoData () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + try { + object value = reader [0]; + Assert.Fail ("#A1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsTrue (reader.Read ()); + Assert.IsFalse (reader.Read ()); + + try { + object value = reader [0]; + Assert.Fail ("#B1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [Int32] + public void Indexer1_Value_Invalid () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee"; + reader = cmd.ExecuteReader (); + Assert.IsTrue (reader.Read ()); + try { + object value = reader [-1]; + Assert.Fail ("#A1:" + value); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + object value = reader [1]; + Assert.Fail ("#B1:" + value); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [String] + public void Indexer2 () + { + IDataReader reader = null; + + try { + cmd.CommandText = "SELECT * FROM employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + Assert.IsTrue (reader.Read ()); + Assert.AreEqual (1, reader ["id"], "id"); + Assert.AreEqual ("suresh", reader ["fname"], "fname"); + Assert.AreEqual ("kumar", reader ["lname"], "lname"); + Assert.AreEqual (new DateTime (1978, 8, 22), reader ["doB"], "doB"); + Assert.AreEqual (new DateTime (2001, 3, 12), reader ["doj"], "doj"); + Assert.AreEqual ("suresh@gmail.com", reader ["EmaiL"], "EmaiL"); + Assert.AreEqual (1, reader ["iD"], "iD"); + Assert.AreEqual ("suresh@gmail.com", reader ["eMail"], "eMail"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [String] + public void Indexer2_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee"; + reader = cmd.ExecuteReader (); + reader.Read (); + reader.Close (); + + try { + object value = reader ["fname"]; + Assert.Fail ("#A1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + reader = cmd.ExecuteReader (); + reader.Close (); + + try { + object value = reader ["fname"]; + Assert.Fail ("#B1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [String] + public void Indexer2_Reader_NoData () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee WHERE lname='kumar'"; + reader = cmd.ExecuteReader (); + + try { + object value = reader ["fname"]; + Assert.Fail ("#A1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsTrue (reader.Read ()); + Assert.IsFalse (reader.Read ()); + + try { + object value = reader ["fname"]; + Assert.Fail ("#B1:" + value); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [String] + public void Indexer2_Value_NotFound () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee"; + reader = cmd.ExecuteReader (); + Assert.IsTrue (reader.Read ()); + try { + object value = reader ["address"]; + Assert.Fail ("#A1:" + value); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + object value = reader [string.Empty]; + Assert.Fail ("#B1:" + value); + } catch (IndexOutOfRangeException ex) { + // Index was outside the bounds of the array + Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] // this [String] + public void Indexer2_Value_Null () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select fname from employee"; + reader = cmd.ExecuteReader (); + try { + object value = reader [(string) null]; + Assert.Fail ("#1:" + value); + } catch (ArgumentNullException ex) { + Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.AreEqual ("fieldName", ex.ParamName, "#5"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void IsClosed_Command_Disposed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + Assert.IsFalse (reader.IsClosed, "#1"); + cmd.Dispose (); + Assert.IsFalse (reader.IsClosed, "#2"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void IsClosed_Connection_Closed () + { + if (RunningOnMono) + Assert.Ignore ("We do not mark the corresponding Reader closed when we close a Connection."); + + IDataReader reader = null; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + Assert.IsFalse (reader.IsClosed, "#1"); + ConnectionManager.Instance.Sql.CloseConnection (); + Assert.IsTrue (reader.IsClosed, "#2"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void IsClosed_Reader_Closed () + { + IDataReader reader = null; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + Assert.IsFalse (reader.IsClosed, "#1"); + reader.Close (); + Assert.IsTrue (reader.IsClosed, "#2"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void NumericTest() + { + cmd.CommandText = "select type_numeric1 from numeric_family where id = 1;"; + + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read(), "#1"); + object value = reader.GetValue (0); + Assert.AreEqual (typeof (decimal), value.GetType (), "#2"); + Assert.AreEqual (1000m, value, "#3"); + } + } + + [Test] + public void TinyIntTest () + { + cmd.CommandText = "select type_tinyint from numeric_family where id = 1;"; + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#1"); + object value = reader.GetValue (0); + Assert.AreEqual (typeof (byte), value.GetType (), "#2"); + Assert.AreEqual (255, value, "#3"); + } + } + + [Test] + public void GetByteTest () + { + cmd.CommandText = "select type_tinyint from numeric_family where id = 1"; + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#1"); + byte b = reader.GetByte (0); + Assert.AreEqual (255, b, "#2"); + } + } + + [Test] + public void GetValue_Reader_Closed () + { + //Console.WriteLine ("GetValue_Reader_Closed - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read ()); + reader.Close (); + + try { + reader.GetValue (-1); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + } + + [Test] + public void GetValue_Reader_NoData () + { + //Console.WriteLine ("GetValue_Reader_NoData - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 666"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + try { + rdr.GetValue (-1); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsFalse (rdr.Read (), "#B"); + + try { + rdr.GetValue (-1); + Assert.Fail ("#C1"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + } + } + } + + [Test] + public void GetValue_Type_Binary () + { + object value; + object expected; + + cmd.CommandText = "select type_binary from binary_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = new byte [] { 0x35, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#A5"); + + expected = new byte [] { 0x00, 0x33, 0x34, 0x00, + 0x33, 0x30, 0x35, 0x31 }; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#B5"); + + expected = new byte [8]; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (DBNull.Value, value, "#D4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = new byte [] { 0x35, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#E5"); + + expected = new byte [] { 0x00, 0x33, 0x34, 0x00, + 0x33, 0x30, 0x35, 0x31 }; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#F5"); + + expected = new byte [8]; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_Image () + { + object value; + object expected; + + //Console.WriteLine ("GetValue_Type_Image - first_executereader"); + cmd.CommandText = "select type_blob from binary_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = new byte [] { 0x32, 0x56, 0x00, + 0x44, 0x22 }; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#A5"); + + expected = long_bytes; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#B5"); + + expected = new byte [0]; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (DBNull.Value, value, "#D4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#D5"); + } + + //Console.WriteLine ("GetChars_Reader_Closed - second_executereader"); + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = new byte [] { 0x32, 0x56, 0x00, + 0x44, 0x22 }; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#E5"); + + expected = long_bytes; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#F5"); + + expected = new byte [0]; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_Integer () + { + object value; + object expected; + + cmd.CommandText = "select type_int from numeric_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = int.MaxValue; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#A5"); + + expected = int.MinValue; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#B5"); + + expected = 0; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (DBNull.Value, value, "#D4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = int.MaxValue; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#E5"); + + expected = int.MinValue; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#F5"); + + expected = 0; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (int), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_NText () + { + object value; + object expected; + + cmd.CommandText = "select type_ntext from string_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = "nt\u092d\u093ext"; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#A5"); + + expected = "nt\u092d\u093ext "; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#B5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = "nt\u092d\u093ext"; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#E5"); + + expected = "nt\u092d\u093ext "; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#F5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_NVarChar () + { + object value; + object expected; + + cmd.CommandText = "select type_nvarchar from string_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = "nv\u092d\u093e\u0930\u0924r"; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#A5"); + + expected = "nv\u092d\u093e\u0930\u0924r "; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#B5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = "nv\u092d\u093e\u0930\u0924r"; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#E5"); + + expected = "nv\u092d\u093e\u0930\u0924r "; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#F5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_Real () + { + object value; + object expected; + + cmd.CommandText = "select type_float from numeric_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = 3.40E+38F; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#A5"); + + expected = -3.40E+38F; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#B5"); + + expected = 0F; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = 3.40E+38F; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#E5"); + + expected = -3.40E+38F; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#F5"); + + expected = 0F; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (float), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_SmallDateTime () + { + object value; + object expected; + + cmd.CommandText = "select type_smalldatetime from datetime_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = DateTime.Parse ("2037-12-31 23:59:00"); + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (DateTime), rdr.GetFieldType (0), "#A5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (DateTime), rdr.GetFieldType (0), "#B5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = DateTime.Parse ("2037-12-31 23:59:00"); + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (DateTime), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (DateTime), rdr.GetFieldType (0), "#D5"); + } + } + + [Test] + public void GetValue_Type_SmallInt () + { + object value; + object expected; + + cmd.CommandText = "select type_smallint from numeric_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = short.MaxValue; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#A5"); + + expected = short.MinValue; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#B5"); + + expected = (short) 0; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = short.MaxValue; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#E5"); + + expected = short.MinValue; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#F5"); + + expected = (short) 0; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (short), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_Text () + { + object value; + object expected; + + cmd.CommandText = "select type_text from string_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = "text"; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#A5"); + + StringBuilder sb = new StringBuilder (); + for (int i = 0; i < 30; i++) + sb.Append ("longtext "); + expected = sb.ToString (); + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#B5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = "text"; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#E5"); + + StringBuilder sb = new StringBuilder (); + for (int i = 0; i < 30; i++) + sb.Append ("longtext "); + expected = sb.ToString (); + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#F5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_TinyInt () + { + object value; + object expected; + + cmd.CommandText = "select type_tinyint from numeric_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = byte.MaxValue; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#A5"); + + expected = byte.MinValue; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#B5"); + + expected = (byte) 0x00; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = byte.MaxValue; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#E5"); + + expected = byte.MinValue; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#F5"); + + expected = (byte) 0x00; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (byte), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_VarBinary () + { + object value; + object expected; + + cmd.CommandText = "select type_varbinary from binary_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = new byte [] { 0x30, 0x31, 0x32, 0x33, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, + 0x35, 0x36, 0x37, 0x38, 0x39, 0x00, 0x44, + 0x53}; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#A5"); + + expected = new byte [] { 0x00, 0x39, 0x38, 0x37, + 0x36, 0x35, 0x00, 0x33, 0x32, 0x31, 0x30, + 0x31, 0x32, 0x33, 0x34 }; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#B5"); + + expected = new byte [0]; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (DBNull.Value, value, "#D4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = new byte [] { 0x30, 0x31, 0x32, 0x33, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, + 0x35, 0x36, 0x37, 0x38, 0x39, 0x00, 0x44, + 0x53}; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#E5"); + + expected = new byte [] { 0x00, 0x39, 0x38, 0x37, + 0x36, 0x35, 0x00, 0x33, 0x32, 0x31, 0x30, + 0x31, 0x32, 0x33, 0x34 }; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#F5"); + + expected = new byte [0]; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (byte []), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetValue_Type_VarChar () + { + object value; + object expected; + + cmd.CommandText = "select type_varchar from string_family order by id asc"; + using (IDataReader rdr = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + expected = "varchar"; + + Assert.IsTrue (rdr.Read (), "#A1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#A2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#A3"); + Assert.AreEqual (expected, value, "#A4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#A5"); + + expected = "varchar "; + + Assert.IsTrue (rdr.Read (), "#B1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#B2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#B3"); + Assert.AreEqual (expected, value, "#B4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#B5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#C1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#C2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#C3"); + Assert.AreEqual (expected, value, "#C4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#C5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#D1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#D2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#D3"); + Assert.AreEqual (expected, value, "#D4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#D5"); + } + + using (IDataReader rdr = cmd.ExecuteReader ()) { + expected = "varchar"; + + Assert.IsTrue (rdr.Read (), "#E1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#E2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#E3"); + Assert.AreEqual (expected, value, "#E4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#E5"); + + expected = "varchar "; + + Assert.IsTrue (rdr.Read (), "#F1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#F2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#F3"); + Assert.AreEqual (expected, value, "#F4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#F5"); + + expected = string.Empty; + + Assert.IsTrue (rdr.Read (), "#G1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#G2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#G3"); + Assert.AreEqual (expected, value, "#G4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#G5"); + + expected = DBNull.Value; + + Assert.IsTrue (rdr.Read (), "#H1"); + value = rdr.GetValue (0); + Assert.IsNotNull (value, "#H2"); + Assert.AreEqual (expected.GetType (), value.GetType (), "#H3"); + Assert.AreEqual (expected, value, "#H4"); + Assert.AreEqual (typeof (string), rdr.GetFieldType (0), "#H5"); + } + } + + [Test] + public void GetBytes () + { + //Console.WriteLine ("GetBytes - first_executereader"); + byte [] expected = new byte [] { 0x32, 0x56, 0x00, 0x44, 0x22 }; + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#A1"); + + // Get By Parts for the column blob + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + int buffsize = 3; + int offset = 0; + long ret = 0; + long count = 0; + byte [] val = new byte [totalsize]; + //Console.WriteLine ("GetBytes:: totalsize={0}", totalsize); + do { + ret = reader.GetBytes (0, offset, val, offset, + (int) Math.Min (buffsize, totalsize - count)); + offset += (int) ret; + count += ret; + } while (count < totalsize); + + Assert.AreEqual (expected.Length, count, "#A2"); + Assert.AreEqual (expected, val, "#A3"); + } + + //Console.WriteLine ("GetBytes - second_executereader"); + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + + // Get By Parts for the column blob + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + int buffsize = 3; + int offset = 0; + long ret = 0; + long count = 0; + byte [] val = new byte [totalsize]; + + do { + ret = reader.GetBytes (0, offset, val, offset, + (int) Math.Min (buffsize, totalsize - count)); + offset += (int) ret; + count += ret; + } while (count < totalsize); + + Assert.AreEqual (expected.Length, count, "#B2"); + Assert.AreEqual (expected, val, "#B3"); + } + + //Console.WriteLine ("GetBytes - third_executereader"); + // buffer size > (buffer offset + length) > remaining data + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize + 5]; + int buffer_offset = 3; + + long ret = reader.GetBytes (0, 0, val, buffer_offset, (int) totalsize); + Assert.AreEqual (expected.Length, ret, "#C1"); + for (int i = 0; i < buffer_offset; i++) + Assert.AreEqual (0x00, val [i], "#C2:" + i); + for (int i = 0; i < totalsize; i++) + Assert.AreEqual (expected [i], val [buffer_offset + i], "#C3:" + i); + } + + //Console.WriteLine ("GetBytes - fourth_executereader"); + // buffer size > (buffer offset + length) > remaining data + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize + 5]; + int buffer_offset = 3; + + long ret = reader.GetBytes (0, 0, val, buffer_offset, (int) totalsize); + Assert.AreEqual (expected.Length, ret, "#D1"); + for (int i = 0; i < buffer_offset; i++) + Assert.AreEqual (0x00, val [i], "#D2:" + i); + for (int i = 0; i < totalsize; i++) + Assert.AreEqual (expected [i], val [buffer_offset + i], "#D3:" + i); + } + + /* FIXME: dataIndex is currently ignored */ + /* + behavior = CommandBehavior.SingleResult | CommandBehavior.SequentialAccess; + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#E1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + + int bufferIndex = 3; + long ret = 0L; + byte [] val = new byte [totalsize + bufferIndex]; + for (int i = 0; i < val.Length; i++) + val [i] = 0x0a; + ret = reader.GetBytes (0, 1L, val, bufferIndex, (int) (totalsize - 2)); + Assert.AreEqual (3, ret, "#E2"); + Assert.AreEqual (new byte [] { 0x0a, 0x0a, 0x0a, 0x56, 0x00, 0x44, 0x0a, 0x0a }, val, "#E3"); + try { + reader.GetBytes (0, 3L, val, 1, 2); + Assert.Fail ("#E4"); + } catch (InvalidOperationException ex) { + // Invalid GetBytes attempt at dataIndex '3'. + // With CommandBehavior.SequentialAccess, you + // may only read from dataIndex '4' or greater + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#E5"); + Assert.IsNull (ex.InnerException, "#E6"); + Assert.IsNotNull (ex.Message, "#E7"); + Assert.IsTrue (ex.Message.IndexOf ("CommandBehavior.SequentialAccess") != -1, "#E8:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf ("'" + 3L.ToString (CultureInfo.InvariantCulture) + "'") != -1, "#E9:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf ("'" + 4L.ToString (CultureInfo.InvariantCulture) + "'") != -1, "#E10:" + ex.Message); + } + + ret = reader.GetBytes (0, 4L, val, bufferIndex + 4, 2); + Assert.AreEqual (1, ret, "#E11"); + Assert.AreEqual (new byte [] { 0x0a, 0x0a, 0x0a, 0x56, 0x00, 0x44, 0x0a, 0x22 }, val, "#E12"); + } + + //Console.WriteLine ("GetBytes - fifth_executereader"); + behavior = CommandBehavior.SingleResult; + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#F1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + + int bufferIndex = 3; + long ret = 0L; + byte [] val = new byte [totalsize + bufferIndex]; + for (int i = 0; i < val.Length; i++) + val [i] = 0x0a; + ret = reader.GetBytes (0, 1L, val, bufferIndex, (int) (totalsize - 2)); + Assert.AreEqual (3, ret, "#F2"); + Assert.AreEqual (new byte [] { 0x0a, 0x0a, 0x0a, 0x56, 0x00, 0x44, 0x0a, 0x0a }, val, "#F3"); + ret = reader.GetBytes (0, 3L, val, 1, 2); + Assert.AreEqual (2, ret, "#F4"); + Assert.AreEqual (new byte [] { 0x0a, 0x44, 0x22, 0x56, 0x00, 0x44, 0x0a, 0x0a }, val, "#F5"); + } + */ + } + + [Test] + public void GetBytes_Buffer_Null () + { + //Console.WriteLine ("GetBytes_Buffer_Null- first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id in (1,2,3,4) order by id"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#A1"); + Assert.AreEqual (5, reader.GetBytes (0, 0, null, 0, 0), "#A2"); + + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual (275, reader.GetBytes (0, 0, null, 0, 0), "#B2"); + + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual (0, reader.GetBytes (0, 0, null, 0, 0), "#C2"); + + Assert.IsTrue (reader.Read (), "#D1"); + if (conn is SqlConnection) { + try { + reader.GetBytes (0, 0, null, 0, 0); + Assert.Fail ("#D2"); + } catch (SqlNullValueException ex) { + // Data is Null. This method or + // property cannot be called on + // Null values + Assert.AreEqual (typeof (SqlNullValueException), ex.GetType (), "#D3"); + Assert.IsNull (ex.InnerException, "#D4"); + Assert.IsNotNull (ex.Message, "#D5"); + } + } else { + Assert.AreEqual (-1, reader.GetBytes (0, 0, null, 0, 0), "#D2"); + } + } + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#E1"); + Assert.AreEqual (5, reader.GetBytes (0, 5, null, 3, 8), "#E2"); + + Assert.IsTrue (reader.Read (), "#F1"); + Assert.AreEqual (275, reader.GetBytes (0, 5, null, 3, 4), "#F2"); + + Assert.IsTrue (reader.Read (), "#G1"); + Assert.AreEqual (0, reader.GetBytes (0, 5, null, 3, 4), "#G2"); + + Assert.IsTrue (reader.Read (), "#H1"); + if (conn is SqlConnection) { + try { + reader.GetBytes (0, 5, null, 3, 4); + Assert.Fail ("#H2"); + } catch (SqlNullValueException ex) { + // Data is Null. This method or + // property cannot be called on + // Null values + Assert.AreEqual (typeof (SqlNullValueException), ex.GetType (), "#H3"); + Assert.IsNull (ex.InnerException, "#H4"); + Assert.IsNotNull (ex.Message, "#H5"); + } + } else { + Assert.AreEqual (-1, reader.GetBytes (0, 5, null, 3, 4), "#H2"); + } + } + + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#I1"); + Assert.AreEqual (5, reader.GetBytes (0, 0, null, 0, 0), "#I2"); + + Assert.IsTrue (reader.Read (), "#J1"); + Assert.AreEqual (275, reader.GetBytes (0, 0, null, 0, 0), "#J2"); + + Assert.IsTrue (reader.Read (), "#K1"); + Assert.AreEqual (0, reader.GetBytes (0, 0, null, 0, 0), "#K2"); + + Assert.IsTrue (reader.Read (), "#L1"); + if (conn is SqlConnection) { + try { + reader.GetBytes (0, 0, null, 0, 0); + Assert.Fail ("#L2"); + } catch (SqlNullValueException ex) { + // Data is Null. This method or + // property cannot be called on + // Null values + Assert.AreEqual (typeof (SqlNullValueException), ex.GetType (), "#L3"); + Assert.IsNull (ex.InnerException, "#L4"); + Assert.IsNotNull (ex.Message, "#L5"); + } + } else { + if (RunningOnMono) + Assert.AreEqual (-1, reader.GetBytes (0, 0, null, 0, 0), "#L2"); + else { + try { + reader.GetBytes (0, 0, null, 0, 0); + Assert.Fail ("#L2"); + } catch (InvalidCastException) { + // Unable to cast object of type + // 'System.DBNull' to type 'System.Byte[]' + } + } + } + } + + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#M1"); + Assert.AreEqual (5, reader.GetBytes (0, 5, null, 3, 8), "#M2"); + + Assert.IsTrue (reader.Read (), "#N1"); + Assert.AreEqual (275, reader.GetBytes (0, 5, null, 3, 4), "#N2"); + + Assert.IsTrue (reader.Read (), "#O1"); + Assert.AreEqual (0, reader.GetBytes (0, 5, null, 3, 4), "#O2"); + + Assert.IsTrue (reader.Read (), "#P1"); + if (conn is SqlConnection) { + try { + reader.GetBytes (0, 5, null, 3, 4); + Assert.Fail ("#P2"); + } catch (SqlNullValueException ex) { + // Data is Null. This method or + // property cannot be called on + // Null values + Assert.AreEqual (typeof (SqlNullValueException), ex.GetType (), "#P3"); + Assert.IsNull (ex.InnerException, "#P4"); + Assert.IsNotNull (ex.Message, "#P5"); + } + } else { + if (RunningOnMono) + Assert.AreEqual (-1, reader.GetBytes (0, 0, null, 0, 0), "#L2"); + else { + try { + reader.GetBytes (0, 0, null, 0, 0); + Assert.Fail ("#L2"); + } catch (InvalidCastException) { + // Unable to cast object of type + // 'System.DBNull' to type 'System.Byte[]' + } + } + } + } + } + + [Test] + [Category("NotWorking")] + public void GetBytes_DataIndex_Overflow () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 2"; + + //Console.WriteLine ("GetBytes_DataIndex_Overflow - first_executereader"); + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize * 2]; + long ret; + + // dataIndex > total size, length = 0 + ret = reader.GetBytes (0, totalsize + 5, val, 0, 0); + Assert.AreEqual (0, ret, "#C1"); + // dataIndex > total size, length < total size + ret = reader.GetBytes (0, totalsize + 5, val, 0, 5); + Assert.AreEqual (0, ret, "#C2"); + // dataIndex > total size, length > total size + ret = reader.GetBytes (0, totalsize + 5, val, 0, (int) (totalsize + 5)); + Assert.AreEqual (0, ret, "#C3"); + } + + //Console.WriteLine ("GetBytes_DataIndex_Overflow - second_executereader"); + using (IDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize * 2]; + long ret; + + // dataIndex > total size, length = 0 + ret = reader.GetBytes (0, totalsize + 5, val, 0, 0); + Assert.AreEqual (0, ret, "#B1"); + // dataIndex > total size, length < total size + ret = reader.GetBytes (0, totalsize + 5, val, 0, 5); + Assert.AreEqual (0, ret, "#B2"); + // dataIndex > total size, length > total size + ret = reader.GetBytes (0, totalsize + 5, val, 0, (int) (totalsize + 5)); + Assert.AreEqual (0, ret, "#B3"); + } + } + + [Test] + public void GetBytes_DataIndex_OffSet () + { + //Console.WriteLine ("GetBytes_DataIndex_Offset - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 2"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + long ret; + + // start reading at index 0 + ret = reader.GetBytes (0, 0, val, 0, 5); + Assert.AreEqual (5, ret, "#A1"); + for (int i = 0; i < ret; i++) + Assert.AreEqual (long_bytes [i], val [i], "#A2:" + i); + Assert.AreEqual (0x00, val [5], "#A3"); + + // attempt to read data prior to current pointer + try { + reader.GetBytes (0, 4, val, 0, 5); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // Invalid GetBytes attempt at dataIndex '4' + // With CommandBehavior.SequentialAccess, + // you may only read from dataIndex '5' + // or greater. + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + Assert.IsTrue (ex.Message.IndexOf ("'4'") != -1, "#B5:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf ("'5'") != -1, "#B6:" + ex.Message); + } + + // continue reading at current pointer + ret = reader.GetBytes (0, 5, val, 5, 6); + Assert.AreEqual (6, ret, "#C1"); + for (int i = 0; i < 11; i++) + Assert.AreEqual (long_bytes [i], val [i], "#C2:" + i); + Assert.AreEqual (0x00, val [11], "#C3"); + + // skip 4 characters + ret = reader.GetBytes (0, 15, val, 13, (val.Length - 13)); + Assert.AreEqual (260, ret, "#D1"); + for (int i = 0; i < 11; i++) + Assert.AreEqual (long_bytes [i], val [i], "#D2:" + i); + for (int i = 11; i < 13; i++) + Assert.AreEqual (0x00, val [i], "#D3:" + i); + for (int i = 13; i < (totalsize - 4); i++) + Assert.AreEqual (long_bytes [i + 2], val [i], "#D4:" + i); + } + + //Console.WriteLine ("GetBytes_DataIndex_Offset - second_executereader"); + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + long ret; + + int offset = (int) totalsize - 5; + int buffer_offset = 7; + + // start reading at a specific position + ret = reader.GetBytes (0, offset, val, buffer_offset, + val.Length - buffer_offset); + Assert.AreEqual (5, ret, "#E1"); + for (int i = 0; i < buffer_offset; i++) + Assert.AreEqual (0x00, val [i], "#E2:" + i); + for (int i = 0; i < ret; i++) + Assert.AreEqual (long_bytes [offset + i], val [buffer_offset + i], "#E3:" + i); + for (int i = (buffer_offset + (int) ret); i < val.Length; i++) + Assert.AreEqual (0x00, val [i], "#E4:" + i); + } + } + + [Test] + public void GetBytes_Reader_Closed () + { + //Console.WriteLine ("GetBytes_Reader_Closed - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#1"); + reader.Close (); + + try { + reader.GetBytes (0, 0, null, -1, 0); + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + } + } + +#if DONT_RUN + [Test] + public void GetBytes_Reader_NoData () + { + //Console.WriteLine ("GetBytes_Reader_NoData - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + try { + reader.GetBytes (0, 0, null, -1, 0); + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // No data exists for the row/column + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + } + } +#endif + [Test] + public void GetSchemaTableTest_AutoIncrement () + { + cmd.CommandText = "select type_autoincrement from numeric_family"; + cmd.ExecuteNonQuery (); + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly)) { + DataTable schemaTable = reader.GetSchemaTable (); + Assert.IsTrue ((bool) schemaTable.Rows [0]["IsAutoIncrement"], "#1"); + + if (!RunningOnMono) { + /* FIXME: we always set it to false */ + if (schemaTable.Columns.Contains ("IsIdentity")) + Assert.IsTrue ((bool) schemaTable.Rows [0] ["IsIdentity"], "#2"); + } + } + } + + [Test] + [Category("NotWorking")] + public void GetValues_Reader_Closed () + { + //Console.WriteLine ("GetValues_Reader_Closed - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + Assert.IsTrue (rdr.Read ()); + rdr.Close (); + + try { + rdr.GetValues ((object []) null); + Assert.Fail ("#1"); + } catch (ArgumentNullException ex) { + // No data exists for the row/column + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + } + + [Test] + [Category("NotWorking")] + public void GetValues_Reader_NoData () + { + //Console.WriteLine ("GetValues_Reader_NoData - first_executereader"); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 666"; + + using (IDataReader rdr = cmd.ExecuteReader ()) { + try { + rdr.GetValues ((object []) null); + Assert.Fail ("#A1"); + } catch (ArgumentNullException ex) { + // No data exists for the row/column + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsFalse (rdr.Read (), "#B"); + + try { + rdr.GetValues ((object []) null); + Assert.Fail ("#C1"); + } catch (ArgumentNullException ex) { + // No data exists for the row/column + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + } + } + } + + static bool RunningOnMono { + get { + return (Type.GetType ("System.MonoType", false) != null); + } + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs new file mode 100644 index 0000000000..e93f9fbcca --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs @@ -0,0 +1,114 @@ +// DbDataReaderTest.cs - NUnit Test Cases for testing the +// DbDataReader family of classes +// +// Authors: +// Gert Driesen (drieseng@users.sourceforge.net) +// +// Copyright (c) 2008 Gert Driesen +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.SqlTypes; +using System.Globalization; +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected +{ + [TestFixture] + [Category ("sqlserver")] + public class DbDataReaderTest + { + DbConnection conn; + DbCommand cmd; + DbDataReader rdr; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = conn.CreateCommand (); + } + + [TearDown] + public void TearDown () + { + cmd?.Dispose (); + rdr?.Dispose (); + ConnectionManager.Instance.Close (); + } + + [Test] + public void GetProviderSpecificValues_Reader_Closed () + { + cmd.CommandText = "SELECT * FROM employee"; + rdr = cmd.ExecuteReader (); + rdr.Close (); + + try { + rdr.GetProviderSpecificValues (null); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // Invalid attempt to call MetaData + // when reader is closed + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void GetProviderSpecificValues_Reader_NoData () + { + cmd.CommandText = "SELECT * FROM employee where id = 6666"; + rdr = cmd.ExecuteReader (); + + try { + rdr.GetProviderSpecificValues (null); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // Invalid attempt to read when no data + // is present + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + Assert.IsFalse (rdr.Read (), "B"); + + try { + rdr.GetProviderSpecificValues (null); + Assert.Fail ("#C1"); + } catch (InvalidOperationException ex) { + // Invalid attempt to read when no data + // is present + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + } + } + } +} + diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/IDbCommandTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/IDbCommandTest.cs new file mode 100644 index 0000000000..aa430adf70 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/IDbCommandTest.cs @@ -0,0 +1,210 @@ +// IDbCommandTest.cs - NUnit Test Cases for testing the +// IDbCommand implemented classes. +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE.using System; + +using System; +using System.Data; +using System.Data.Common; +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected +{ + [TestFixture] + [Category ("odbc"), Category ("sqlserver")] + public class CommandTest + { + IDbConnection conn; + IDbCommand cmd; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = conn.CreateCommand (); + } + + [TearDown] + public void TearDown () + { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Close (); + } + + [Test] + public void ExecuteNonQuery_CommandText_Empty () + { + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // ExecuteNonQuery: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteNonQuery"), "#A5:" + ex.Message); + } + + cmd.CommandText = string.Empty; + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // ExecuteNonQuery: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteNonQuery"), "#B5:" + ex.Message); + } + + cmd.CommandText = null; + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#C1"); + } catch (InvalidOperationException ex) { + // ExecuteNonQuery: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteNonQuery"), "#C5:" + ex.Message); + } + } + + [Test] + public void ExecuteReader_CommandText_Empty () + { + try { + cmd.ExecuteReader (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // ExecuteReader: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteReader"), "#A5:" + ex.Message); + } + + cmd.CommandText = string.Empty; + + try { + cmd.ExecuteReader (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // ExecuteReader: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteReader"), "#B5:" + ex.Message); + } + + cmd.CommandText = null; + + try { + cmd.ExecuteReader (); + Assert.Fail ("#C1"); + } catch (InvalidOperationException ex) { + // ExecuteReader: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteReader"), "#C5:" + ex.Message); + } + } + + [Test] // bug #462947 + public void ExecuteReader_Connection_Reuse () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + CommandBehavior behavior = CommandBehavior.SequentialAccess | + CommandBehavior.SingleResult; + + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#A1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + long ret = reader.GetBytes (0, 0, val, 0, val.Length); + Assert.AreEqual (5, ret, "#A2"); + Assert.AreEqual (new byte [] { 0x32, 0x56, 0x00, 0x44, 0x22 }, val, "#A3"); + } + + ConnectionManager.Instance.Sql.CloseConnection (); + conn = ConnectionManager.Instance.Sql.Connection; + + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#B1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + long ret = reader.GetBytes (0, 0, val, 0, val.Length); + Assert.AreEqual (5, ret, "#B2"); + Assert.AreEqual (new byte [] { 0x32, 0x56, 0x00, 0x44, 0x22 }, val, "#B3"); + } + + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#C"); + } + + ConnectionManager.Instance.Sql.CloseConnection (); + conn = ConnectionManager.Instance.Sql.Connection; + + + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#D"); + } + + using (IDataReader reader = cmd.ExecuteReader (behavior)) { + Assert.IsTrue (reader.Read (), "#E"); + } + } + + [Test] + public void ExecuteScalar () + { + cmd.CommandText = "select count(*) from employee where id < 3"; + Assert.AreEqual (2, (int) Convert.ChangeType (cmd.ExecuteScalar (), + typeof (int)), + "#1"); + cmd.Dispose (); + + cmd = conn.CreateCommand (); + cmd.CommandText = "select id from employee where id = 666"; + Assert.IsNull (cmd.ExecuteScalar (), "#2"); + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs new file mode 100644 index 0000000000..4583ca8fe1 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs @@ -0,0 +1,779 @@ +// OdbcCommandBuilderTest.cs - NUnit Test Cases for testing the +// OdbcCommandBuilder Test. +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#if !NO_ODBC + +using System; +using System.Data; +using System.Data.Common; +using System.Data.Odbc; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.Odbc +{ + [TestFixture] + [Category ("odbc")] + public class OdbcCommandBuilderTest + { + [Test] + public void GetInsertCommandTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb; + + cb = new OdbcCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO employee (id, lname) VALUES (?, ?)", + cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertInsertParameters (cmd, "#A3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO \"employee (\"id, \"lname) VALUES (?, ?)", + cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertInsertParameters (cmd, "#B3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuoteSuffix = "´"; + + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO employee´ (id´, lname´) VALUES (?, ?)", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertInsertParameters (cmd, "#C3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + cb.QuoteSuffix = "´"; + + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO \"employee´ (\"id´, \"lname´) VALUES (?, ?)", + cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertInsertParameters (cmd, "#D3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetInsertCommandTestWithExpression () + { + if (ConnectionManager.Instance.Odbc.EngineConfig.Type == EngineType.MySQL) + Assert.Ignore ("Schema info from MySQL is incomplete"); + + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO employee (id, lname) VALUES (?, ?)", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertInsertParameters (cmd, "#3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetUpdateCommandTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE employee SET id = ?, lname = ? WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertUpdateParameters (cmd, "#A3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE \"employee SET \"id = ?, \"lname = ? WHERE ((\"id = ?) AND ((? = 1 AND \"lname IS NULL) OR (\"lname = ?)))", + cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertUpdateParameters (cmd, "#B3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuoteSuffix = "´"; + + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE employee´ SET id´ = ?, lname´ = ? WHERE ((id´ = ?) AND ((? = 1 AND lname´ IS NULL) OR (lname´ = ?)))", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertUpdateParameters (cmd, "#C3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + cb.QuoteSuffix = "´"; + + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE \"employee´ SET \"id´ = ?, \"lname´ = ? WHERE ((\"id´ = ?) AND ((? = 1 AND \"lname´ IS NULL) OR (\"lname´ = ?)))", + cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertUpdateParameters (cmd, "#D3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("FIXME: Auto SQL generation during Update requires a valid SelectCommand")] + public void GetUpdateCommandDBConcurrencyExceptionTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + Assert.IsNotNull (cb); + + DataRow [] rows = ds.Tables [0].Select ("id=1"); + rows [0] [0] = 6660; // non existent + ds.Tables [0].AcceptChanges (); // moves 6660 to original value + rows [0] [0] = 1; // moves 6660 as search key into db table + + try { + da.Update (rows); + Assert.Fail ("#1"); + } catch (DBConcurrencyException ex) { + // Concurrency violation: the UpdateCommand + // affected 0 records + Assert.AreEqual (typeof (DBConcurrencyException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.AreSame (rows [0], ex.Row, "#5"); + Assert.AreEqual (1, ex.RowCount, "#6"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Category("NotWorking")] + public void GetInsertCommandTest_option_true () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetInsertCommand (true); + Assert.AreEqual ("INSERT INTO employee (id, lname) VALUES (?, ?)", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertInsertParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetInsertCommandTest_option_false () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetInsertCommand (false); + Assert.AreEqual ("INSERT INTO employee (id, lname) VALUES (?, ?)", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertInsertParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Category("NotWorking")] + public void GetUpdateCommandTest_option_true () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetUpdateCommand (true); + Assert.AreEqual ("UPDATE employee SET id = ?, lname = ? WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertUpdateParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetUpdateCommandTest_option_false () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetUpdateCommand (false); + Assert.AreEqual ("UPDATE employee SET id = ?, lname = ? WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertUpdateParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Category("NotWorking")] + public void GetDeleteCommandTest_option_true () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetDeleteCommand (true); + Assert.AreEqual ("DELETE FROM employee WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertDeleteParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetDeleteCommandTest_option_false () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + OdbcCommand cmd = cb.GetDeleteCommand (false); + Assert.AreEqual ("DELETE FROM employee WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertDeleteParameters (cmd, "#3:"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void GetDeleteCommandTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname, id+1 as next_id from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + + Assert.AreEqual ("DELETE FROM employee WHERE ((id = ?) AND ((? = 1 AND lname IS NULL) OR (lname = ?)))", + cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertDeleteParameters (cmd, "#A3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("DELETE FROM \"employee WHERE ((\"id = ?) AND ((? = 1 AND \"lname IS NULL) OR (\"lname = ?)))", + cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertDeleteParameters (cmd, "#B3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuoteSuffix = "´"; + + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("DELETE FROM employee´ WHERE ((id´ = ?) AND ((? = 1 AND lname´ IS NULL) OR (lname´ = ?)))", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertDeleteParameters (cmd, "#C3:"); + + cb = new OdbcCommandBuilder (da); + cb.QuotePrefix = "\""; + cb.QuoteSuffix = "´"; + + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("DELETE FROM \"employee´ WHERE ((\"id´ = ?) AND ((? = 1 AND \"lname´ IS NULL) OR (\"lname´ = ?)))", + cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertDeleteParameters (cmd, "#D3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuotePrefix_DeleteCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuotePrefix_InsertCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuotePrefix_UpdateCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuoteSuffix_DeleteCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual (string.Empty, cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuoteSuffix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuoteSuffix_InsertCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual (string.Empty, cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuoteSuffix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore ("QuoteSuffix and QuotePrefix are now in DbCommandBuilder, while commands are in implementation classes. Result: we cannot perform this check until we refactor this.")] + public void QuoteSuffix_UpdateCommand_Generated () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + OdbcCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + OdbcDataAdapter da = new OdbcDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + OdbcCommandBuilder cb = new OdbcCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual (string.Empty, cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = ""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual (string.Empty, cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = ""; + } finally { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] // QuoteIdentifier (String, OdbcConnection) + public void QuoteIdentifier2 () + { + OdbcCommandBuilder cb; + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + string quote_char = ConnectionManager.Instance.Odbc.EngineConfig.QuoteCharacter; + + try { + cb = new OdbcCommandBuilder (); + Assert.AreEqual (quote_char + "mono" + quote_char, cb.QuoteIdentifier ("mono", conn), "#A1"); + Assert.AreEqual (quote_char + "Z" + quote_char, cb.QuoteIdentifier ("Z", conn), "#A2"); + Assert.AreEqual (quote_char + "abc" + quote_char, cb.QuoteIdentifier ("abc", conn), "#A3"); + Assert.AreEqual (quote_char + quote_char, cb.QuoteIdentifier (string.Empty, conn), "#A4"); + Assert.AreEqual (quote_char + " " + quote_char, cb.QuoteIdentifier (" ", conn), "#A5"); + Assert.AreEqual (quote_char + "\r" + quote_char, cb.QuoteIdentifier ("\r", conn), "#A6"); + cb.QuoteSuffix = "def"; + Assert.AreEqual (quote_char + "mono" + quote_char, cb.QuoteIdentifier ("mono", conn), "#A7"); + Assert.AreEqual (quote_char + "Z" + quote_char, cb.QuoteIdentifier ("Z", conn), "#A8"); + Assert.AreEqual (quote_char + "abc" + quote_char, cb.QuoteIdentifier ("abc", conn), "#A9"); + Assert.AreEqual (quote_char + quote_char, cb.QuoteIdentifier (string.Empty, conn), "#A10"); + Assert.AreEqual (quote_char + " " + quote_char, cb.QuoteIdentifier (" ", conn), "#A11"); + Assert.AreEqual (quote_char + "\r" + quote_char, cb.QuoteIdentifier ("\r", conn), "#A12"); + + cb = new OdbcCommandBuilder (); + cb.QuotePrefix = "abc"; + Assert.AreEqual ("abcmono", cb.QuoteIdentifier ("mono", conn), "#B1"); + Assert.AreEqual ("abcZ", cb.QuoteIdentifier ("Z", conn), "#B2"); + Assert.AreEqual ("abcabc", cb.QuoteIdentifier ("abc", conn), "#B3"); + Assert.AreEqual ("abc", cb.QuoteIdentifier (string.Empty, conn), "#B4"); + Assert.AreEqual ("abc ", cb.QuoteIdentifier (" ", conn), "#B5"); + Assert.AreEqual ("abc\r", cb.QuoteIdentifier ("\r", conn), "#B6"); + cb.QuoteSuffix = "def"; + Assert.AreEqual ("abcmonodef", cb.QuoteIdentifier ("mono", conn), "#B7"); + Assert.AreEqual ("abcZdef", cb.QuoteIdentifier ("Z", conn), "#B8"); + Assert.AreEqual ("abcabcdef", cb.QuoteIdentifier ("abc", conn), "#B9"); + Assert.AreEqual ("abcdef", cb.QuoteIdentifier (string.Empty, conn), "#B10"); + Assert.AreEqual ("abc def", cb.QuoteIdentifier (" ", conn), "#B11"); + Assert.AreEqual ("abc\rdef", cb.QuoteIdentifier ("\r", conn), "#B12"); + + cb.QuotePrefix = string.Empty; + + cb = new OdbcCommandBuilder (); + cb.QuotePrefix = "X"; + Assert.AreEqual ("Xmono", cb.QuoteIdentifier ("mono", conn), "#D1"); + Assert.AreEqual ("XZ", cb.QuoteIdentifier ("Z", conn), "#D2"); + Assert.AreEqual ("XX", cb.QuoteIdentifier ("X", conn), "#D3"); + Assert.AreEqual ("X", cb.QuoteIdentifier (string.Empty, conn), "#D4"); + Assert.AreEqual ("X ", cb.QuoteIdentifier (" ", conn), "#D5"); + Assert.AreEqual ("X\r", cb.QuoteIdentifier ("\r", conn), "#D6"); + cb.QuoteSuffix = " "; + Assert.AreEqual ("Xmono ", cb.QuoteIdentifier ("mono", conn), "#D7"); + Assert.AreEqual ("XZ ", cb.QuoteIdentifier ("Z", conn), "#D8"); + Assert.AreEqual ("XX ", cb.QuoteIdentifier ("X", conn), "#D9"); + Assert.AreEqual ("X ", cb.QuoteIdentifier (string.Empty, conn), "#D10"); + Assert.AreEqual ("X ", cb.QuoteIdentifier (" ", conn), "#D11"); + Assert.AreEqual ("X\r ", cb.QuoteIdentifier ("\r", conn), "#D12"); + + cb = new OdbcCommandBuilder (); + cb.QuotePrefix = " "; + Assert.AreEqual ("mono", cb.QuoteIdentifier ("mono", conn), "#E1"); + Assert.AreEqual ("Z", cb.QuoteIdentifier ("Z", conn), "#E2"); + Assert.AreEqual ("abc", cb.QuoteIdentifier ("abc", conn), "#E3"); + Assert.AreEqual (string.Empty, cb.QuoteIdentifier (string.Empty, conn), "#E4"); + Assert.AreEqual (" ", cb.QuoteIdentifier (" ", conn), "#E5"); + Assert.AreEqual ("\r", cb.QuoteIdentifier ("\r", conn), "#E6"); + cb.QuoteSuffix = "def"; + Assert.AreEqual ("mono", cb.QuoteIdentifier ("mono", conn), "#E7"); + Assert.AreEqual ("Z", cb.QuoteIdentifier ("Z", conn), "#E8"); + Assert.AreEqual ("abc", cb.QuoteIdentifier ("abc", conn), "#E9"); + Assert.AreEqual (string.Empty, cb.QuoteIdentifier (string.Empty, conn), "#E10"); + Assert.AreEqual (" ", cb.QuoteIdentifier (" ", conn), "#E11"); + Assert.AreEqual ("\r", cb.QuoteIdentifier ("\r", conn), "#E12"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + void AssertInsertParameters (OdbcCommand cmd, string prefix) + { + Assert.AreEqual (2, cmd.Parameters.Count, prefix + "Count"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [0].DbType, prefix + "DbType (0)"); + Assert.AreEqual ("p1", cmd.Parameters [0].ParameterName, prefix + "ParameterName (0)"); + Assert.AreEqual ("id", cmd.Parameters [0].SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsNull (cmd.Parameters [0].Value, prefix + "Value (0)"); + Assert.AreEqual (DbType.String, cmd.Parameters [1].DbType, prefix + "DbType (1)"); + Assert.AreEqual ("p2", cmd.Parameters [1].ParameterName, prefix + "ParameterName (1)"); + Assert.AreEqual ("lname", cmd.Parameters [1].SourceColumn, prefix + "SourceColumn (1)"); + Assert.IsNull (cmd.Parameters [1].Value, prefix + "Value (1)"); + } + + void AssertUpdateParameters (OdbcCommand cmd, string prefix) + { + Assert.AreEqual (5, cmd.Parameters.Count, prefix + "Count"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [0].DbType, prefix + "DbType (0)"); + Assert.AreEqual ("p1", cmd.Parameters [0].ParameterName, prefix + "ParameterName (0)"); + Assert.AreEqual ("id", cmd.Parameters [0].SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsNull (cmd.Parameters [0].Value, prefix + "Value (0)"); + Assert.AreEqual (DbType.String, cmd.Parameters [1].DbType, prefix + "DbType (1)"); + Assert.AreEqual ("p2", cmd.Parameters [1].ParameterName, prefix + "ParameterName (1)"); + Assert.AreEqual ("lname", cmd.Parameters [1].SourceColumn, prefix + "SourceColumn (1)"); + Assert.IsNull (cmd.Parameters [1].Value, prefix + "Value (1)"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [2].DbType, prefix + "DbType (2)"); + Assert.AreEqual ("p3", cmd.Parameters [2].ParameterName, prefix + "ParameterName (2)"); + Assert.AreEqual ("id", cmd.Parameters [2].SourceColumn, prefix + "SourceColumn (2)"); + Assert.IsNull (cmd.Parameters [2].Value, prefix + "Value (2)"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [3].DbType, prefix + "DbType (3)"); + Assert.AreEqual ("p4", cmd.Parameters [3].ParameterName, prefix + "ParameterName (3)"); + Assert.AreEqual ("lname", cmd.Parameters [3].SourceColumn, prefix + "SourceColumn (3)"); + Assert.AreEqual (1, cmd.Parameters [3].Value, prefix + "Value (3)"); + Assert.AreEqual (DbType.String, cmd.Parameters [4].DbType, prefix + "DbType (4)"); + Assert.AreEqual ("p5", cmd.Parameters [4].ParameterName, prefix + "ParameterName (4)"); + Assert.AreEqual ("lname", cmd.Parameters [4].SourceColumn, prefix + "SourceColumn (4)"); + Assert.IsNull (cmd.Parameters [4].Value, prefix + "Value (4)"); + } + + void AssertDeleteParameters (OdbcCommand cmd, string prefix) + { + Assert.AreEqual (3, cmd.Parameters.Count, prefix + "Count"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [0].DbType, prefix + "DbType (0)"); + Assert.AreEqual ("p1", cmd.Parameters [0].ParameterName, prefix + "ParameterName (0)"); + Assert.AreEqual ("id", cmd.Parameters [0].SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsNull (cmd.Parameters [0].Value, prefix + "Value (0)"); + Assert.AreEqual (DbType.Int32, cmd.Parameters [1].DbType, prefix + "DbType (1)"); + Assert.AreEqual ("p2", cmd.Parameters [1].ParameterName, prefix + "ParameterName (1)"); + Assert.AreEqual ("lname", cmd.Parameters [1].SourceColumn, prefix + "SourceColumn (1)"); + Assert.AreEqual (1, cmd.Parameters [1].Value, prefix + "Value (1)"); + Assert.AreEqual (DbType.String, cmd.Parameters [2].DbType, prefix + "DbType (2)"); + Assert.AreEqual ("p3", cmd.Parameters [2].ParameterName, prefix + "ParameterName (2)"); + Assert.AreEqual ("lname", cmd.Parameters [2].SourceColumn, prefix + "SourceColumn (2)"); + Assert.IsNull (cmd.Parameters [2].Value, prefix + "Value (2)"); + } + + // FIXME: test SetAllValues + // FIXME: Add tests for examining RowError + // FIXME: Add test for ContinueUpdateOnError property + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs new file mode 100644 index 0000000000..27826d094b --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs @@ -0,0 +1,301 @@ +// OdbcCommandTest.cs - NUnit Test Cases for testing the +// OdbcCommand class +// +// Authors: +// Sureshkumar T (TSureshkumar@novell.com) +// Umadevi S (sumadevi@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_ODBC + +using System; +using System.Data; +using System.Data.Common; +using System.Data.Odbc; +using NUnit.Framework; + + +namespace MonoTests.System.Data.Connected.Odbc +{ + [TestFixture] + [Category ("odbc")] + public class OdbcCommandTest + { + OdbcConnection conn; + OdbcCommand cmd; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Odbc.Connection; + cmd = conn.CreateCommand (); + } + + [TearDown] + public void TearDown () + { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Close (); + } + + [Test] + public void PrepareAndExecuteTest () + { + OdbcDataReader reader = null; + + try { + string tableName = DBHelper.GetRandomName ("PAE", 3); + try { + // setup table + string query = "DROP TABLE " + tableName ; + DBHelper.ExecuteNonQuery (conn, query); + query = String.Format ("CREATE TABLE {0} ( id INT, small_id SMALLINT )", + tableName); + DBHelper.ExecuteNonQuery (conn, query); + + query = String.Format ("INSERT INTO {0} values (?, ?)", tableName); + cmd = conn.CreateCommand (); + cmd.CommandText = query; + cmd.Prepare (); + + OdbcParameter param1 = cmd.Parameters.Add ("?", OdbcType.Int); + OdbcParameter param2 = cmd.Parameters.Add ("?", OdbcType.SmallInt); + param1.Value = 1; + param2.Value = 5; + cmd.ExecuteNonQuery (); + + param1.Value = 2; + param2.Value = 6; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "select id, small_id from " + tableName + " order by id asc"; + reader = cmd.ExecuteReader (); + + Assert.IsTrue (reader.Read (), "#A1"); + Assert.AreEqual (1, reader.GetValue (0), "#A2"); + Assert.AreEqual (5, reader.GetValue (1), "#A3"); + Assert.IsTrue (reader.Read (), "#A4"); + Assert.AreEqual (2, reader.GetValue (0), "#A5"); + Assert.AreEqual (6, reader.GetValue (1), "#A6"); + Assert.IsFalse (reader.Read (), "#A7"); + reader.Close (); + cmd.Dispose (); + + cmd = conn.CreateCommand (); + cmd.CommandText = "select id, small_id from " + tableName + " order by id asc"; + + reader = cmd.ExecuteReader (); + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual (1, reader.GetValue (0), "#B2"); + Assert.AreEqual (5, reader.GetValue (1), "#B3"); + Assert.IsTrue (reader.Read (), "#B4"); + Assert.AreEqual (2, reader.GetValue (0), "#B5"); + Assert.AreEqual (6, reader.GetValue (1), "#B6"); + Assert.IsFalse (reader.Read (), "#B7"); + } finally { + DBHelper.ExecuteNonQuery (conn, "DROP TABLE " + tableName); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + /// + /// Test String parameters to ODBC Command + /// + [Test] + public void ExecuteStringParameterTest() + { + cmd.CommandText = "select count(*) from employee where fname=?;"; + string colvalue = "suresh"; + OdbcParameter param = cmd.Parameters.Add("@un", OdbcType.VarChar); + param.Value = colvalue; + int count = Convert.ToInt32 (cmd.ExecuteScalar ()); + Assert.AreEqual (1, count, "#1 String parameter not passed correctly"); + } + + /// + /// Test ExecuteNonQuery + /// + [Test] + public void ExecuteNonQueryTest () + { + int ret; + + cmd.CommandType = CommandType.Text; + cmd.CommandText = "select count(*) from employee where id <= ?;"; + cmd.Parameters.Add ("@un", OdbcType.Int).Value = 3; + ret = cmd.ExecuteNonQuery (); + switch (ConnectionManager.Instance.Odbc.EngineConfig.Type) { + case EngineType.SQLServer: + Assert.AreEqual (-1, ret, "#1"); + break; + case EngineType.MySQL: + Assert.AreEqual (1, ret, "#1"); + break; + default: + Assert.Fail ("Engine type not supported."); + break; + } + + cmd = conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "select * from employee where id <= ?;"; + cmd.Parameters.Add ("@un", OdbcType.Int).Value = 3; + ret = cmd.ExecuteNonQuery (); + switch (ConnectionManager.Instance.Odbc.EngineConfig.Type) { + case EngineType.SQLServer: + Assert.AreEqual (-1, ret, "#2"); + break; + case EngineType.MySQL: + Assert.AreEqual (3, ret, "#2"); + break; + default: + Assert.Fail ("Engine type not supported."); + break; + } + + cmd = conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "select * from employee where id <= 3;"; + ret = cmd.ExecuteNonQuery (); + switch (ConnectionManager.Instance.Odbc.EngineConfig.Type) { + case EngineType.SQLServer: + Assert.AreEqual (-1, ret, "#3"); + break; + case EngineType.MySQL: + Assert.AreEqual (3, ret, "#3"); + break; + default: + Assert.Fail ("Engine type not supported."); + break; + } + + try { + // insert + cmd = conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "insert into employee (id, fname, dob, doj) values " + + " (6001, 'tttt', '1999-01-22', '2005-02-11');"; + ret = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, ret, "#4"); + + cmd = conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "insert into employee (id, fname, dob, doj) values " + + " (?, 'tttt', '1999-01-22', '2005-02-11');"; + cmd.Parameters.Add (new OdbcParameter ("id", OdbcType.Int)); + cmd.Parameters [0].Value = 6002; + cmd.Prepare (); + ret = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, ret, "#5"); + } finally { + // delete + cmd = (OdbcCommand) conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "delete from employee where id > 6000"; + ret = cmd.ExecuteNonQuery (); + Assert.AreEqual (2, ret, "#6"); + } + } + + [Test] + public void ExecuteNonQuery_Query_Invalid () + { + cmd.CommandText = "select id1 from numeric_family"; ; + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#A1"); + } catch (OdbcException ex) { + // Invalid column name 'id1' + Assert.AreEqual (typeof (OdbcException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A5"); + } + + // ensure connection is not closed after error + + int result; + + cmd.CommandText = "INSERT INTO numeric_family (id, type_int) VALUES (6100, 200)"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#B1"); + + cmd.CommandText = "DELETE FROM numeric_family WHERE id = 6100"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#B1"); + } + + [Test] + public void Dispose () + { + OdbcTransaction trans = null; + + try { + trans = conn.BeginTransaction (); + + cmd.CommandText = "SELECT 'a'"; + cmd.CommandTimeout = 67; + cmd.CommandType = CommandType.StoredProcedure; + cmd.DesignTimeVisible = false; + cmd.Parameters.Add (new OdbcParameter ()); + cmd.Transaction = trans; + cmd.UpdatedRowSource = UpdateRowSource.OutputParameters; + + cmd.Dispose (); + + Assert.AreEqual (string.Empty, cmd.CommandText, "#1"); + Assert.AreEqual (67, cmd.CommandTimeout, "#2"); + Assert.AreEqual (CommandType.StoredProcedure, cmd.CommandType, "#3"); + Assert.IsNull (cmd.Connection, "#4"); + Assert.IsFalse (cmd.DesignTimeVisible, "#5"); + Assert.IsNotNull (cmd.Parameters, "#6"); + Assert.AreEqual (0, cmd.Parameters.Count, "#7"); + Assert.IsNull (cmd.Transaction, "#8"); + Assert.AreEqual (UpdateRowSource.OutputParameters, cmd.UpdatedRowSource, "#9"); + } finally { + if (trans != null) + trans.Rollback (); + } + } + + [Test] // bug #341743 + public void Dispose_Connection_Disposed () + { + cmd.CommandText = "SELECT 'a'"; + cmd.ExecuteNonQuery (); + + conn.Dispose (); + + Assert.AreSame (conn, cmd.Connection, "#1"); + cmd.Dispose (); + Assert.IsNull (cmd.Connection, "#2"); + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs new file mode 100644 index 0000000000..02c7c9a4ca --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs @@ -0,0 +1,122 @@ +// OdbcDataAdapterTest.cs - NUnit Test Cases for testing the +// OdbcDataAdapter class +// Author: +// Sureshkumar T (TSureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_ODBC + +using System; +using System.Data; +using System.Data.Odbc; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.Odbc +{ + [TestFixture] + [Category ("odbc")] + public class OdbcDataAdapterTest + { + [Test] + public void FillTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try + { + // For this Test, you must create sample table + // called person-age, with a non-zero number of rows + // and non-zero number of columns + // run the test initialization script mono_test_mysql.sql + string tableName = "employee"; + string sql= "select * from " + tableName; + OdbcDataAdapter da = new OdbcDataAdapter (sql, (OdbcConnection) conn); + DataSet ds = new DataSet (tableName); + da.Fill (ds, tableName); + Assert.AreEqual (true, + ds.Tables.Count > 0, + "#1 Table count must not be zero"); + Assert.AreEqual (true, + ds.Tables [0].Rows.Count > 0, + "#2 Row count must not be zero"); + foreach (DataColumn dc in ds.Tables [0].Columns) + Assert.AreEqual (true, + dc.ColumnName.Length > 0, + "#3 DataSet column names must noot be of size 0"); + foreach (DataRow dr in ds.Tables [0].Rows) { + foreach (DataColumn dc in ds.Tables [0].Columns) + Assert.AreEqual (true, + dc.ColumnName.Length > 0, + "#4 column values must not be of size 0"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + [Ignore] + public void InsertUtf8Test () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + try + { + DoExecuteNonQuery ((OdbcConnection) conn, + "CREATE TABLE odbc_ins_utf8_test(ival int not null, sval varchar(20))"); + Assert.AreEqual (DoExecuteNonQuery ((OdbcConnection) conn, + "INSERT INTO odbc_ins_utf8_test(ival, sval) VALUES (1, 'English')"), + 1); + Assert.AreEqual (DoExecuteNonQuery ((OdbcConnection) conn, + "INSERT INTO odbc_ins_utf8_test(ival, sval) VALUES (2, 'Français')"), + 1); + Assert.AreEqual (DoExecuteNonQuery ((OdbcConnection) conn, + "INSERT INTO odbc_ins_utf8_test(ival, sval) VALUES (3, 'Español')"), + 1); + Assert.AreEqual (DoExecuteScalar ((OdbcConnection) conn, + "SELECT COUNT(*) FROM odbc_ins_utf8_test WHERE sval " + + "IN('English', 'Français', 'Español')"), + 3); + } finally { + DoExecuteNonQuery ((OdbcConnection) conn, "DROP TABLE odbc_ins_utf8_test"); + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + private int DoExecuteNonQuery (OdbcConnection conn, string sql) + { + OdbcCommand cmd = new OdbcCommand (sql, conn); + return cmd.ExecuteNonQuery (); + } + + private int DoExecuteScalar (OdbcConnection conn, string sql) + { + OdbcCommand cmd = new OdbcCommand (sql, conn); + object value = cmd.ExecuteScalar (); + return (int) Convert.ChangeType (value, typeof (int)); + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs new file mode 100644 index 0000000000..a91b13eeca --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs @@ -0,0 +1,1140 @@ +// +// OdbcDataReaderTest.cs - NUnit Test Cases for testing the +// OdbcDataReader class +// +// Author: +// Sureshkumar T (TSureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_ODBC + +using System; +using System.Data; +using System.Data.Common; +using System.Data.Odbc; +using System.Globalization; +using System.Text; +using NUnit.Framework; + + +namespace MonoTests.System.Data.Connected.Odbc +{ + [TestFixture] + [Category ("odbc")] + public class OdbcDataReaderTest + { + static byte [] long_bytes = new byte [] { + 0x00, 0x66, 0x06, 0x66, 0x97, 0x00, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, + 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, + 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, + 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, 0x06, + 0x66, 0x06, 0x66, 0x97, 0x06, 0x66, 0x06, 0x66, 0x97, + 0x06, 0x66, 0x06, 0x66, 0x98}; + + OdbcConnection conn; + OdbcCommand cmd; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Odbc.Connection; + cmd = conn.CreateCommand (); + } + + [TearDown] + public void TearDown () + { + if (cmd != null) + cmd.Dispose (); + ConnectionManager.Instance.Close (); + } + + [Test] + public void GetBytes () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#C1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + + byte [] val = new byte [totalsize]; + long ret = reader.GetBytes (0, 0L, val, 0, (int) (totalsize * 2)); + Assert.AreEqual (totalsize, ret, "#C2"); + Assert.AreEqual (new byte [] { 0x32, 0x56, 0x00, 0x44, 0x22 }, val, "#C3"); + } + + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 2"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#G1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + + byte [] val = new byte [totalsize]; + int offset = 0; + long ret = 0; + long count = 0; + do { + ret = reader.GetBytes (0, offset, val, offset, 50); + offset += (int) ret; + count += ret; + } while (count < totalsize); + + Assert.AreEqual (long_bytes.Length, count, "#G2"); + Assert.AreEqual (long_bytes, val, "#G3"); + } + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult)) { + Assert.IsTrue (reader.Read (), "#H1"); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + + byte [] val = new byte [totalsize]; + int offset = 0; + long ret = 0; + long count = 0; + do { + ret = reader.GetBytes (0, offset, val, offset, 50); + offset += (int) ret; + count += ret; + } while (count < totalsize); + + Assert.AreEqual (long_bytes.Length, count, "#H2"); + Assert.AreEqual (long_bytes, val, "#H3"); + } + } + + [Test] + public void GetBytes_Buffer_TooSmall () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 2"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize - 1]; + + long ret = reader.GetBytes (0, 0, val, 0, (int) totalsize); + Assert.AreEqual (274, ret, "#A1"); + for (int i = 0; i < ret; i++) + Assert.AreEqual (long_bytes [i], val [i], "#A2:" + i); + for (long i = ret; i < val.Length; i++) + Assert.AreEqual (0x00, val [i], "#A3:" + i); + } + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + int buffer_offset = 1; + + long ret = reader.GetBytes (0, 0, val, buffer_offset, (int) totalsize); + Assert.AreEqual (274, ret, "#B1"); + Assert.AreEqual (0x00, val [0], "#B2"); + for (int i = 0; i < ret; i++) + Assert.AreEqual (long_bytes [i], val [i + buffer_offset], "#B2:" + i); + for (long i = (ret + buffer_offset); i < val.Length; i++) + Assert.AreEqual (0x00, val [i], "#B3:" + i); + } + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult | CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read ()); + + long totalsize = reader.GetBytes (0, 0, null, 0, 0); + byte [] val = new byte [totalsize]; + + long ret = reader.GetBytes (0, 0, val, 0, (int) (totalsize + 1)); + Assert.AreEqual (totalsize, ret, "#C1"); + } + + ConnectionManager.Instance.Odbc.CloseConnection (); + } + + [Test] + public void GetBytes_BufferIndex_Negative () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#1"); + + try { + reader.GetBytes (0, 0, null, -1, 0); + Assert.Fail ("#2"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual ("bufferIndex", ex.ParamName, "#6"); + } + } + } + + [Test] + public void GetBytes_DataIndex_Negative () + { + IDbCommand cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#A1"); + + try { + reader.GetBytes (0, -1L, null, 0, 0); + Assert.Fail ("#A2"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#A3"); + Assert.IsNull (ex.InnerException, "#A4"); + Assert.IsNotNull (ex.Message, "#A5"); + Assert.AreEqual ("dataIndex", ex.ParamName, "#A6"); + } + } + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SingleResult)) { + Assert.IsTrue (reader.Read (), "#B1"); + + try { + reader.GetBytes (0, -1L, null, 0, 0); + Assert.Fail ("#B2"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#B3"); + Assert.IsNull (ex.InnerException, "#B4"); + Assert.IsNotNull (ex.Message, "#B5"); + Assert.AreEqual ("dataIndex", ex.ParamName, "#B6"); + } + } + } + + [Test] + public void GetBytes_Length_Negative () + { + cmd.CommandText = "SELECT type_blob FROM binary_family where id = 1"; + + using (IDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess)) { + Assert.IsTrue (reader.Read (), "#1"); + + try { + reader.GetBytes (0, 0, null, 0, -1); + Assert.Fail ("#2"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual ("length", ex.ParamName, "#6"); + } + } + } + + [Test] + public void GetSchemaTable () + { + IDataReader reader = null; + DataTable schema; + DataRow pkRow; + + try { + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#A:"); + Assert.AreEqual (3, schema.Rows.Count, "#A:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#A:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#A:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#A:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#A:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#A:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#A:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#A:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#A:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#A:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#A:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#A:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#A:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#A:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#A:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#A:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#A:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#A:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#A:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#A:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#A:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#A:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#A:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#A:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#A:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#A:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#A:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#A:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#A:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#A:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#A:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#A:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#A:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#A:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#A:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#A:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#A:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#B:"); + Assert.AreEqual (3, schema.Rows.Count, "#B:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#B:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#B:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#B:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#B:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#B:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#B:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#B:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#B:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#B:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#B:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#B:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#B:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#B:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#B:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#B:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#B:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#B:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#B:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#B:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#B:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#B:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#B:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#B:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#B:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#B:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#B:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#B:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#B:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#B:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#B:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#B:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#B:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#B:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#B:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#B:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#B:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#C:"); + Assert.AreEqual (3, schema.Rows.Count, "#C:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#C:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#C:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#C:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#C:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#C:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#C:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#C:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#C:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#C:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#C:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#C:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#C:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#C:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#C:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#C:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#C:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#C:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#C:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#C:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#C:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#C:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#C:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#C:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#C:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#C:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#C:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#C:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#C:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#C:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#C:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#C:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#C:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#C:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#C:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#C:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#C:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#D:"); + Assert.AreEqual (3, schema.Rows.Count, "#D:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#D:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#D:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#D:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#D:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#D:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#D:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#D:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#D:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#D:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#D:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#D:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#D:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#D:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#D:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#D:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#D:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#D:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#D:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#D:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#D:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#D:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#D:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#D:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#D:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#D:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#D:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#D:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#D:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#D:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#D:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#D:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#D:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#D:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#D:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#D:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#D:BaseColumnName_Value"); + + cmd = conn.CreateCommand (); + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; + cmd.Prepare (); + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#E:"); + Assert.AreEqual (3, schema.Rows.Count, "#E:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#E:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#E:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#E:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#E:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#E:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#E:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#E:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#E:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#E:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#E:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#E:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#E:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#E:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#E:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#E:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#E:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#E:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#E:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#E:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#E:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#E:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#E:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#E:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#E:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#E:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#E:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#E:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#E:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#E:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#E:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#E:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#E:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#E:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#E:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#E:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#E:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#F:"); + Assert.AreEqual (3, schema.Rows.Count, "#F:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#F:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#F:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#F:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#F:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#F:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#F:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#F:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#F:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#F:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#F:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#F:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#F:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#F:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#F:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#F:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#F:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#F:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#F:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#F:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#F:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#F:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#F:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#F:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#F:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#F:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#F:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#F:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#F:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#F:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#F:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#F:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#F:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#F:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#F:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#F:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#F:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#G:"); + Assert.AreEqual (3, schema.Rows.Count, "#G:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#G:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#G:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#G:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#G:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#G:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#G:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#G:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#G:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#G:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#G:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#G:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#G:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#G:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#G:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#G:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#G:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#G:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#G:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#G:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#G:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#G:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#G:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#G:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#G:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#G:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#G:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#G:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#G:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#G:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#G:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#G:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#G:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#G:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#G:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#G:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#G:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#H:"); + Assert.AreEqual (3, schema.Rows.Count, "#H:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#H:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#H:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#H:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#H:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#H:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#H:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#H:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#H:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#H:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#H:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#H:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#H:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#H:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#H:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#H:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#H:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#H:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#H:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#H:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#H:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#H:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#H:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#H:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#H:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#H:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#H:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#H:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#H:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#H:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#H:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#H:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#H:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#H:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#H:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#H:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#H:BaseColumnName_Value"); + + cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee where id = ?"; + IDbDataParameter param = cmd.CreateParameter (); + cmd.Parameters.Add (param); + param.DbType = DbType.Int32; + param.Value = 2; + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#I:"); + Assert.AreEqual (3, schema.Rows.Count, "#I:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#I:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#I:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#I:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#I:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#I:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#I:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#I:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#I:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#I:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#I:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#I:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#I:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#I:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#I:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#I:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#I:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#I:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#I:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#I:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#I:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#I:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#I:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#I:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#I:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#I:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#I:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#I:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#I:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#I:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#I:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#I:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#I:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#I:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#I:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#I:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#I:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#J:"); + Assert.AreEqual (3, schema.Rows.Count, "#J:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#J:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#J:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#J:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#J:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#J:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#J:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#J:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#J:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#J:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#J:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#J:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#J:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#J:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#J:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#J:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#J:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#J:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#J:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#J:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#J:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#J:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#J:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#J:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#J:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#J:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#J:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#J:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#J:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#J:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#J:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#J:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#J:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#J:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#J:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#J:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#J:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (CommandBehavior.KeyInfo); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#K:"); + Assert.AreEqual (3, schema.Rows.Count, "#K:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#K:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#K:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#K:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#K:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#K:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#K:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#K:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#K:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#K:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#K:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#K:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#K:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#K:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#K:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#K:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#K:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#K:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#K:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#K:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#K:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#K:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#K:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#K:IsUnique_IsNull"); + Assert.AreEqual (true, pkRow ["IsUnique"], "#K:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#K:IsKey_IsNull"); + Assert.AreEqual (true, pkRow ["IsKey"], "#K:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#K:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#K:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#K:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#K:BaseSchemaName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseCatalogName"), "#K:BaseCatalogName_IsNull"); + Assert.AreEqual (ConnectionManager.Instance.DatabaseName, pkRow ["BaseCatalogName"], "#K:BaseCatalogName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseTableName"), "#K:BaseTableName_IsNull"); + Assert.AreEqual ("employee", pkRow ["BaseTableName"], "#K:BaseTableName_Value"); + Assert.IsFalse (pkRow.IsNull ("BaseColumnName"), "#K:BaseColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["BaseColumnName"], "#K:BaseColumnName_Value"); + + reader = cmd.ExecuteReader (); + schema = reader.GetSchemaTable (); + reader.Close (); + + AssertSchemaTableStructure (schema, "#L:"); + Assert.AreEqual (3, schema.Rows.Count, "#L:RowCount"); + pkRow = schema.Select ("ColumnName = 'id'") [0]; + Assert.IsFalse (pkRow.IsNull ("ColumnName"), "#L:ColumnName_IsNull"); + Assert.AreEqual ("id", pkRow ["ColumnName"], "#L:ColumnName_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnOrdinal"), "#L:ColumnOrdinal_IsNull"); + Assert.AreEqual (0, pkRow ["ColumnOrdinal"], "#L:ColumnOrdinal_Value"); + Assert.IsFalse (pkRow.IsNull ("ColumnSize"), "#L:ColumnSize_IsNull"); + Assert.AreEqual (4, pkRow ["ColumnSize"], "#L:ColumnSize_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericPrecision"), "#L:NumericPrecision_IsNull"); + Assert.AreEqual (10, pkRow ["NumericPrecision"], "#L:NumericPrecision_Value"); + Assert.IsFalse (pkRow.IsNull ("NumericScale"), "#L:NumericScale_IsNull"); + Assert.AreEqual (0, pkRow ["NumericScale"], "#L:NumericScale_Value"); + Assert.IsFalse (pkRow.IsNull ("DataType"), "#L:DataType_IsNull"); + Assert.AreEqual (typeof (int), pkRow ["DataType"], "#L:DataType_Value"); + Assert.IsFalse (pkRow.IsNull ("ProviderType"), "#L:ProviderType_IsNull"); + Assert.AreEqual (10, pkRow ["ProviderType"], "#L:ProviderType_Value"); + Assert.IsFalse (pkRow.IsNull ("IsLong"), "#L:IsLong_IsNull"); + Assert.AreEqual (false, pkRow ["IsLong"], "#L:IsLong_Value"); + Assert.IsFalse (pkRow.IsNull ("AllowDBNull"), "#L:AllowDBNull_IsNull"); + Assert.AreEqual (false, pkRow ["AllowDBNull"], "#L:AllowDBNull_Value"); + Assert.IsFalse (pkRow.IsNull ("IsReadOnly"), "#L:IsReadOnly_IsNull"); + Assert.AreEqual (false, pkRow ["IsReadOnly"], "#L:IsReadOnly_Value"); + Assert.IsFalse (pkRow.IsNull ("IsRowVersion"), "#L:IsRowVersion_IsNull"); + Assert.AreEqual (false, pkRow ["IsRowVersion"], "#L:IsRowVersion_Value"); + Assert.IsFalse (pkRow.IsNull ("IsUnique"), "#L:IsUnique_IsNull"); + Assert.AreEqual (false, pkRow ["IsUnique"], "#L:IsUnique_Value"); + Assert.IsFalse (pkRow.IsNull ("IsKey"), "#L:IsKey_IsNull"); + Assert.AreEqual (false, pkRow ["IsKey"], "#L:IsKey_Value"); + Assert.IsFalse (pkRow.IsNull ("IsAutoIncrement"), "#L:IsAutoIncrement_IsNull"); + Assert.AreEqual (false, pkRow ["IsAutoIncrement"], "#L:IsAutoIncrement_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseSchemaName"), "#L:BaseSchemaName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseSchemaName"], "#L:BaseSchemaName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseCatalogName"), "#L:BaseCatalogName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseCatalogName"], "#L:BaseCatalogName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseTableName"), "#L:BaseTableName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseTableName"], "#L:BaseTableName_Value"); + Assert.IsTrue (pkRow.IsNull ("BaseColumnName"), "#L:BaseColumnName_IsNull"); + Assert.AreEqual (DBNull.Value, pkRow ["BaseColumnName"], "#L:BaseColumnName_Value"); + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void OutputParametersTest () + { + // MySQL currently does not support output parameters + // in its ODBC connector: + // http://www.paragon-cs.com/mag/issue3.pdf + if (ConnectionManager.Instance.Odbc.EngineConfig.Type != EngineType.SQLServer) + Assert.Ignore ("MySQL does not (yet) support output parameters using ODBC."); + + IDataReader reader = null; + + try { + cmd.CommandText = "{? = CALL sp_get_age (?, ?)}"; + + OdbcParameter ret = new OdbcParameter ("ret", OdbcType.Int); + cmd.Parameters.Add (ret); + ret.Direction = ParameterDirection.ReturnValue; + + OdbcParameter name = new OdbcParameter ("fname", OdbcType.VarChar); + cmd.Parameters.Add (name); + name.Direction = ParameterDirection.Input; + name.Value = "suresh"; + + OdbcParameter age = new OdbcParameter ("age", OdbcType.Int); + cmd.Parameters.Add (age); + age.Direction = ParameterDirection.Output; + + reader = cmd.ExecuteReader (); + reader.Close (); + + /* FIXME: we don't support output/return parameters */ + if (!RunningOnMono) { + Assert.IsTrue (((int) (age.Value)) > 0, "#1"); + Assert.IsTrue (((int) ret.Value) > 0, "#2"); + } + } finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void LongTextTest () + { + IDataReader reader = null; + + try { + cmd.CommandText = "Select type_text from string_family where id=2"; + + reader = cmd.ExecuteReader (); + reader.Read (); + reader.GetValue (0); + }finally { + if (reader != null) + reader.Close (); + } + } + + [Test] + public void Bug82135Test () + { + const string drop_table = "drop table odbcnodatatest"; + + // cleanup in case of previously failed test + DBHelper.ExecuteNonQuery (conn, drop_table); + + cmd = new OdbcCommand ("create table odbcnodatatest (ID int not null, Val1 text)", + conn); + cmd.ExecuteNonQuery (); + cmd = new OdbcCommand ("delete from odbcnodatatest", conn); + Assert.AreEqual (0, cmd.ExecuteNonQuery ()); + + // cleanup + cmd = new OdbcCommand (drop_table, conn); + cmd.ExecuteNonQuery (); + } + + [Test] + public void Bug82560Test () + { + string drop_table = "DROP TABLE odbc_alias_test"; + + // cleanup in case of previously failed test + DBHelper.ExecuteNonQuery (conn, drop_table); + + DoExecuteNonQuery (conn, "CREATE TABLE odbc_alias_test" + + "(ifld INT NOT NULL PRIMARY KEY, sfld VARCHAR(20))"); + DoExecuteNonQuery (conn, "INSERT INTO odbc_alias_test" + + "(ifld, sfld) VALUES (1, '1111')"); + DoExecuteScalar (conn, "SELECT A.ifld FROM odbc_alias_test " + + "A WHERE A.ifld = 1"); + DoExecuteNonQuery (conn, drop_table); + } + + [Test] + public void FindZeroInToStringTest () + { + if (ConnectionManager.Instance.Odbc.EngineConfig.Type != EngineType.MySQL) + Assert.Ignore ("Only applies to MySQL."); + + IDataReader reader = null; + + try { + // Create table + cmd.CommandText = "Create table foo ( bar long varchar )"; + cmd.ExecuteNonQuery(); + cmd.Dispose (); + + // Insert a record into foo + cmd = conn.CreateCommand (); + cmd.CommandText = "Insert into foo (bar) values ( '" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "This string has more than 255 characters" + + "' )"; + cmd.ExecuteNonQuery(); + cmd.Dispose (); + + // Now, get the record back - try and read it two different ways. + cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT bar FROM foo" ; + reader = cmd.ExecuteReader (); + string readAsString = ""; + while (reader.Read ()) { + readAsString = reader[0].ToString(); + } + reader.Close(); + cmd.Dispose (); + + // Now, read it using GetBytes + cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT bar FROM foo"; + reader = cmd.ExecuteReader (); + byte[] buffer = new byte [2048]; + long total = 0; + while (reader.Read ()) { + total = reader.GetBytes (0, 0, buffer, 0, 2048); + } + reader.Close(); + // Convert bytes read to string - look for binary zero - there is none (OK) + string readAsBytes = Encoding.Default.GetString (buffer, 0, (int) total); + Assert.AreEqual (readAsBytes, readAsString, "#1 ReadAsString is not same as ReadAsBytes"); + } finally { + if (reader != null) + reader.Close (); + DBHelper.ExecuteNonQuery (conn, "Drop table foo"); + } + } + + [Test] + public void Bug332404Test () + { + if (ConnectionManager.Instance.Odbc.EngineConfig.Type != EngineType.MySQL) + Assert.Ignore ("Only applies to MySQL."); + + cmd = new OdbcCommand ("DROP TABLE IF EXISTS odbc_test"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("CREATE TABLE odbc_test (id_test INTEGER NOT NULL, payload DECIMAL (14,4) NOT NULL)"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("INSERT INTO odbc_test (id_test, payload) VALUES (1, 1.23456789)"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + OdbcDataAdapter Adaptador = new OdbcDataAdapter (); + + DataSet Lector = new DataSet (); + + Adaptador.SelectCommand = new OdbcCommand ("SELECT * FROM odbc_test WHERE id_test=1", (OdbcConnection) conn); + Adaptador.Fill (Lector); + Assert.AreEqual (Lector.Tables[0].Rows[0]["payload"], 1.2346); + } + + [Test] + public void Bug332400Test () + { + if (ConnectionManager.Instance.Odbc.EngineConfig.Type != EngineType.MySQL) + Assert.Ignore ("Only applies to MySQL."); + + cmd = new OdbcCommand ("DROP TABLE IF EXISTS blob_test"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("CREATE TABLE blob_test (id_test INTEGER NOT NULL, payload LONGBLOB NOT NULL)"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("INSERT INTO blob_test (id_test, payload) VALUES (1, 'test')"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + OdbcDataAdapter Adaptador = new OdbcDataAdapter(); + DataSet Lector = new DataSet(); + + Adaptador.SelectCommand = new OdbcCommand("SELECT * FROM blob_test WHERE id_test=1", (OdbcConnection) conn); + Adaptador.Fill(Lector); + } + + [Test] + public void Bug419224Test () + { + cmd = new OdbcCommand ("DROP TABLE IF EXISTS odbc_test"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("CREATE TABLE odbc_test (id_test INTEGER NOT NULL, payload TINYBLOB NOT NULL)"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + cmd = new OdbcCommand ("INSERT INTO odbc_test (id_test, payload) VALUES (1, 'test for bug419224')"); + cmd.Connection = conn; + cmd.ExecuteNonQuery (); + + OdbcDataAdapter adaptador = new OdbcDataAdapter (); + DataSet lector = new DataSet (); + + adaptador.SelectCommand = new OdbcCommand ("SELECT * FROM odbc_test WHERE id_test=1", (OdbcConnection) conn); + adaptador.Fill (lector); + var payload = (byte[])lector.Tables[0].Rows[0]["payload"]; + Assert.AreEqual ("test for bug419224", Encoding.UTF8.GetString(payload)); + + OdbcDataReader newRdr = cmd.ExecuteReader(); + + // tinyblob column index: + int TinyblobIdx = 1; + + bool read = newRdr.Read(); + + if (read) + { + bool ret = newRdr.IsDBNull(TinyblobIdx); + Assert.AreEqual (ret, false); + } + } + + static void DoExecuteNonQuery (OdbcConnection conn, string sql) + { + IDbCommand cmd = new OdbcCommand (sql, conn); + cmd.ExecuteNonQuery (); + } + + static void DoExecuteScalar (OdbcConnection conn, string sql) + { + IDbCommand cmd = new OdbcCommand (sql, conn); + cmd.ExecuteScalar (); + } + + static void AssertSchemaTableStructure (DataTable schemaTable, string prefix) + { + object [] [] columns = { + new object [] { "ColumnName", typeof (string) }, + new object [] { "ColumnOrdinal", typeof (int) }, + new object [] { "ColumnSize", typeof (int) }, + new object [] { "NumericPrecision", typeof (short) }, + new object [] { "NumericScale", typeof (short) }, + new object [] { "DataType", typeof (object) }, + new object [] { "ProviderType", typeof (int) }, + new object [] { "IsLong", typeof (bool) }, + new object [] { "AllowDBNull", typeof (bool) }, + new object [] { "IsReadOnly", typeof (bool) }, + new object [] { "IsRowVersion", typeof (bool) }, + new object [] { "IsUnique", typeof (bool) }, + new object [] { "IsKey", typeof (bool) }, + new object [] { "IsAutoIncrement", typeof (bool) }, + new object [] { "BaseSchemaName", typeof (string) }, + new object [] { "BaseCatalogName", typeof (string) }, + new object [] { "BaseTableName", typeof (string) }, + new object [] { "BaseColumnName", typeof (string) } + }; + + Assert.AreEqual (columns.Length, schemaTable.Columns.Count, prefix); + + for (int i = 0; i < columns.Length; i++) { + DataColumn col = schemaTable.Columns [i]; + Assert.IsTrue (col.AllowDBNull, prefix + "AllowDBNull (" + i + ")"); + Assert.AreEqual (columns [i] [0], col.ColumnName, prefix + "ColumnName (" + i + ")"); + Assert.AreEqual (columns [i] [1], col.DataType, prefix + "DataType (" + i + ")"); + } + } + + static bool RunningOnMono { + get { + return (Type.GetType ("System.MonoType", false) != null); + } + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs new file mode 100644 index 0000000000..0cbcad38ec --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs @@ -0,0 +1,1210 @@ +// +// OdbcParameterCollectionTest.cs - NUnit Test Cases for testing the +// OdbcParameterCollection class +// Author: +// Sureshkumar T (TSureshkumar@novell.com) +// Amit Biswas (amit@amitbiswas.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if !NO_ODBC + +using System; +using System.Text; +using System.Data; +using System.Data.Odbc; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.Odbc +{ + [TestFixture] + [Category ("odbc")] + public class OdbcParameterCollectionTest + { + /// + /// This tests whether the value is trimmed to the + /// given length while passing parameters + /// + [Test] + public void ParameterLengthTrimTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand cmd = conn.CreateCommand (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "SELECT count(*) FROM employee WHERE fname=?"; + + OdbcParameter param = cmd.Parameters.Add("@fname", OdbcType.VarChar, 15); + param.Value = DateTime.Now.ToString (); + Assert.AreEqual (15, param.Size, "#1"); + Assert.AreEqual (0, cmd.ExecuteScalar(), "#2"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); //not initialized and not yet added + OdbcParameter p3Tmp = new OdbcParameter ("p3", "abc"); //not added + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcCmd.Parameters.Insert (1, p2Age); //Inserting the second parameter + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 The collection should contain 2 parameters"); + + //inserting at upper boundary + OdbcCmd.Parameters.Insert (OdbcCmd.Parameters.Count, p3Tmp); //Inserting the third parameter, with name and value at index = count + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#3 The collection should contain 2 parameters"); + + //check the inserted positions + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf ("@lname"), "#4 The first parameter must be at index 0"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Age), "#5 The inserted parameter p2Age must be at index 1"); + Assert.AreEqual (2, OdbcCmd.Parameters.IndexOf (p3Tmp), "#6 The inserted parameter p3Tmp must be at index 2"); + Assert.AreEqual (2, OdbcCmd.Parameters.IndexOf ("p3"), "#7 The inserted parameter p3 must be at index 2"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ("non-existing-parameter"), "#8 Non-existing parameters should return -1"); + + //check for default names and default values + Assert.AreEqual ("Parameter1", OdbcCmd.Parameters[1].ParameterName, "#9 Parameters inserted without any name must get a default name"); + Assert.AreEqual (null, OdbcCmd.Parameters[1].Value, "#10 Parameters inserted without any value must have null value"); + + Assert.AreEqual ("p3", OdbcCmd.Parameters[2].ParameterName, "#11 Parameters inserted without any name must get a default name"); + Assert.AreEqual ("abc", OdbcCmd.Parameters[2].Value, "#12 Parameters inserted without any value must have null value"); + + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[1].OdbcType, "#13 Parameters with null value must be of type NVarChar"); + Assert.AreEqual (OdbcType.Text,OdbcCmd.Parameters[0].OdbcType, "#14 Parameter at index 0 is of type Text"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + /// + /// Inserting parameters in between the collection should not + /// overwrite the existing parameters + /// + [Test] + public void InsertNoOverwriteTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + OdbcParameter p3Tmp = OdbcCmd.Parameters.Add ("@Tmp", OdbcType.Text, 15); + OdbcParameter p4Tmp = new OdbcParameter (); + + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcCmd.Parameters.Insert (1, p4Tmp); //Inserting at index 1 + Assert.AreEqual (4, OdbcCmd.Parameters.Count, "#2 Collection should contain 4 parameters"); + + //Existing parameters should not be overwritten + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf (p1Lname), "#3 The parameter at index 0 should not change"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p4Tmp), "#4 The inserted parameter should be at index 1"); + Assert.AreEqual (2, OdbcCmd.Parameters.IndexOf (p2Age), "#5 The parameter at index 1 should be at index 2 after inserting"); + Assert.AreEqual (3, OdbcCmd.Parameters.IndexOf (p3Tmp), "#6 The parameter at index 2 should be at index 3 after inserting"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ("non-existing-parameter"), "#7 Non-existing parameters should return -1"); + + //check for default names and default values + Assert.AreEqual ("Parameter1", OdbcCmd.Parameters[1].ParameterName, "#8 Parameters inserted without any name must get a default name"); + Assert.AreEqual (null, OdbcCmd.Parameters[1].Value, "#9 Parameters inserted without any value must have null value"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertNullTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Insert (1, null); + Assert.Fail ("Expected exception ArgumentNullException was not thrown"); + } catch (ArgumentNullException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only one parameter after Insert failed"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertEmptyTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Insert (1, string.Empty); + Assert.Fail ("Expected exception InvalidCastException was not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only one parameter after Insert failed"); + } + + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertAlreadyContainedParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); //not initialized and not yet added + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcCmd.Parameters.Insert (1, p2Age); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 The collection must contain 2 parameters"); + try { + OdbcCmd.Parameters.Insert (2, p2Age); //p2Age is already contained + Assert.Fail ("Expected exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#3 The collection must contain 2 parameters after Insert failed"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertArgumentGreaterThanCountTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Insert (OdbcCmd.Parameters.Count + 1, p2Age); //Inserting with wrong index + Assert.Fail ("Expected Exception ArgumentOutOfRangeException not thrown"); + } catch (ArgumentOutOfRangeException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only 1 parameter after Insert failed"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertNegativeArgumentTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Insert (-3, p2Age); //Insert with negative index + Assert.Fail ("Expected Exception ArgumentOutOfRangeException not thrown"); + } catch (ArgumentOutOfRangeException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only 1 parameter after Insert failed"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void InsertNonOdbcParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Insert (1, 4); + Assert.Fail ("Expected exception InvalidCastException was not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only 1 parameter after Insert failed"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + + [Test] + public void AddRangeTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); //not initialized and not yet added + OdbcParameter p3Tmp = new OdbcParameter (); //not initialized and not yet added + OdbcParameter p4Tmp = new OdbcParameter (); //not initialized and not yet added + OdbcParameter p5Tmp = new OdbcParameter (); //not initialized and not yet added + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [] paramArray = new OdbcParameter [4]; + paramArray [0] = p2Age; + paramArray [1] = p3Tmp; + paramArray [2] = p4Tmp; + paramArray [3] = p5Tmp; + OdbcCmd.Parameters.AddRange (paramArray); + Assert.AreEqual (5, OdbcCmd.Parameters.Count, "#2 The array elements are not added"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Age), "#3 The first element must be added after the last parameter"); + Assert.AreEqual (4, OdbcCmd.Parameters.IndexOf (p5Tmp), "#4 Not all elements are added"); + Assert.AreEqual ("Parameter1", OdbcCmd.Parameters[1].ParameterName, "#5 Parameters added without any name must get a default name"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[1].OdbcType, "#6 Parameters with null value must be of type NVarChar"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + // + //If a parameter in the range is already contained, all the parameters before it are added and + //all the parameters after it are rejected + // + [Test] + public void AddRangeParameterAlreadyContainedTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [] paramArray = new OdbcParameter [3]; + paramArray [0] = p2Age; + paramArray [1] = p1Lname; //p1Lname is already contained + paramArray [2] = p3Tmp; + try { + OdbcCmd.Parameters.AddRange (paramArray); + Assert.Fail ("Expected Exception ArgumentException not thrown"); + } catch (ArgumentException){ + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 The collection must contain excatly 2 elements after AddRange failed for the third element"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + // + //If a parameter in the range is null, all the elements in the range are rejected + // + [Test] + public void AddRangeArgumentNullExceptionTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + + OdbcParameter [] paramArray = new OdbcParameter [3]; + paramArray [0] = p2Age; + paramArray [1] = p3Tmp; + paramArray [2] = null; + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.AddRange (paramArray); + Assert.Fail ("Expected Exception ArgumentNullException not thrown"); + } catch (ArgumentNullException){ + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 If any of the parameters in the range is null, none of them should be added"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void AddRangeParameterContainedInAnotherCollTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcCommand OdbcCmd2 = conn.CreateCommand (); + OdbcCmd2.CommandType = CommandType.Text; + OdbcCmd2.CommandText = "SELECT lname FROM employee WHERE fname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + + OdbcParameter [] paramArray = new OdbcParameter [3]; + paramArray [0] = p2Age; + paramArray [1] = p1Lname; //p1Lname is already contained in Odbccmd + paramArray [2] = p3Tmp; + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the parameter collection of OdbcCmd should contain only 1 parameter"); + Assert.AreEqual (0, OdbcCmd2.Parameters.Count, "#2 Initialization error, the parameter collection of OdbcCmd2 should not contain any parameters"); + try { + OdbcCmd2.Parameters.AddRange (paramArray); + Assert.Fail ("Expected Exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#3 The parameter collection of OdbcCmd should not change"); + Assert.AreEqual (1, OdbcCmd2.Parameters.Count, "#4 All the elements before the invalid element must be added to the collection of OdbcCmd2"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void AddRangeMultiDimensionalArrayTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + OdbcParameter p4Tmp = new OdbcParameter (); + OdbcParameter p5Tmp = new OdbcParameter (); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [,] paramArray = new OdbcParameter [2, 2]; + paramArray [0, 0] = p2Age; + paramArray [0, 1] = p3Tmp; + paramArray [1, 0] = p4Tmp; + paramArray [1, 1] = p5Tmp; + OdbcCmd.Parameters.AddRange (paramArray); + Assert.AreEqual (5, OdbcCmd.Parameters.Count, "#2 Not all four parameters of the 2x2 Array are added"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Age), "#3 The first element must be added after the last parameter"); + Assert.AreEqual (4, OdbcCmd.Parameters.IndexOf (p5Tmp), "#4 Not all elements are added"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[4].OdbcType, "#5 Parameters with null value must be of type NVarChar"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void AddRangeArrayValuesArgumentNullExceptionTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + OdbcParameter p5Tmp = new OdbcParameter (); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [,] paramArray = new OdbcParameter [2, 2]; + paramArray [0, 0] = p2Age; + paramArray [0, 1] = p3Tmp; + paramArray [1, 0] = null; + paramArray [1, 1] = p5Tmp; + try { + OdbcCmd.Parameters.AddRange (paramArray); + Assert.Fail ("Expected Exception ArgumentOutOfRangeException not thrown"); + } catch (ArgumentNullException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 None of the elememts must be added if any one of them is null"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + // + //Tests all the three overloads of Contains + // + [Test] + public void ContainsTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + OdbcParameter p3Tmp = new OdbcParameter (); + OdbcCmd.Parameters.Insert (2, p3Tmp); + + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#1 Not all parameters are added"); + Assert.IsTrue (OdbcCmd.Parameters.Contains (p1Lname), "#2 Contains failed for OdbcParameter value"); + Assert.IsTrue (OdbcCmd.Parameters.Contains ("@age"), "#3 Contains failed for string value"); + Assert.IsTrue (OdbcCmd.Parameters.Contains (p3Tmp), "#4 Contains failed for object value"); + Assert.IsFalse (OdbcCmd.Parameters.Contains (null), "#5 Contains must return false for null value"); + Assert.IsFalse (OdbcCmd.Parameters.Contains (""), "#6 Contains must return false for empty string"); + Assert.IsFalse (OdbcCmd.Parameters.Contains ((Object)null), "#6 Contains must return false for empty string"); + Assert.IsFalse (OdbcCmd.Parameters.Contains ((String)null), "#6 Contains must return false for empty string"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void ContainsNonOdbcParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 The collection must contain only one parameter"); + try{ + Assert.IsFalse (OdbcCmd.Parameters.Contains (4), "#2 Contains must return false for non-odbcParameter arguments"); + Assert.Fail ("Expected Exception InvalidCastException not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#3 The collection must contain only one parameter"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void ContainsCaseSensitivityTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("@lname"), "#2 Case sensitivity failed for Contains, should be case insensitive"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("@LNAME"), "#3 Case sensitivity failed for Contains, should be case insensitive"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("@LnAmE"), "#4 Case sensitivity failed for Contains, should be case insensitive"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void ContainsNotMineTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd1 = conn.CreateCommand (); + OdbcCommand OdbcCmd2 = conn.CreateCommand (); + OdbcCmd1.CommandType = CommandType.Text; + OdbcCmd1.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + OdbcCmd2.CommandType = CommandType.Text; + OdbcCmd2.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1 = OdbcCmd1.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2 = OdbcCmd2.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.IsTrue (OdbcCmd1.Parameters.Contains (p1)); + Assert.IsFalse (OdbcCmd1.Parameters.Contains (p2)); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void IndexOfTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + OdbcParameter p3Tmp = new OdbcParameter (); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf (p1Lname), "#1 first parameter not with index 0"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Age), "#2 second parameter not with index 1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (p3Tmp), "#3 non-existing parameter should return -1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (null), "#4 null value should return -1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (""), "#5 Empty string parameter should return -1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ((string)null), "#6 Null string parameter should return -1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ("foo"), "#7 non-existing string parameter should return -1"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ((Object)p2Age), "#8 second parameter passed as Object did not return index 1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ((Object)p3Tmp), "#9 non-existing parameter passed as Object did not return index -1"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf ((Object)null), "#10 null parameter passed as Object should return index -1"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void IndexOfCaseSensitivityTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@AGE", OdbcType.Int, 2); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf ("@lname"), "#2 Case sensitivity failed for IndexOf, should be case insensitive"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf ("@LNAME"), "#3 Case sensitivity failed for IndexOf, should be case insensitive"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ("@AGE"), "#4 Case sensitivity failed for IndexOf, should be case insensitive"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ("@age"), "#5 Case sensitivity failed for IndexOf, should be case insensitive"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void IndexOfNonOdbcParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 The collection must contain only one parameter"); + try{ + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (4), "#2 IndexOf must return -1 for non-odbcParameter arguments"); + Assert.Fail ("Expected Exception InvalidCastException not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#3 The collection must contain only one parameter"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void CopyToTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [] DestinationParamArray = new OdbcParameter [4]; + + OdbcCmd.Parameters.CopyTo (DestinationParamArray, 1); //starting at 1 instead of 0 + + Assert.AreEqual (4, DestinationParamArray.Length, "#2 The array length should not change"); + Assert.AreEqual ("@lname", DestinationParamArray [1].ParameterName, "#3 The first parameter must be copied to array at index 1"); + Assert.AreEqual ("@age", DestinationParamArray [2].ParameterName, "#4 The second parameter must be copied to array at index 2"); + Assert.AreEqual (null, DestinationParamArray [0], "#5 The remaining elements must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [3], "#6 The remaining elements must remain un-initialized"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void CopyToArgumentExceptionTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [] DestinationParamArray = new OdbcParameter [4]; + try{ + OdbcCmd.Parameters.CopyTo (DestinationParamArray, 3); //starting at 3, thus the second element will be at index 4 + Assert.Fail ("Expected Exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (null, DestinationParamArray [0], "#2 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [1], "#3 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [2], "#4 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [3], "#5 The DestinationParamArray must remain un-initialized"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void CopyToMultiDimensionalArrayTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [,] DestinationParamArray = new OdbcParameter [2, 4]; + + try{ + OdbcCmd.Parameters.CopyTo (DestinationParamArray, 1); //DestinationParamArray is multi Dimensional + Assert.Fail ("Expected Exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (null, DestinationParamArray [0, 0], "#2 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [0, 1], "#3 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [1, 2], "#4 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [1, 3], "#5 The DestinationParamArray must remain un-initialized"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void CopyToLowerBoundCheckTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = */OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter [] DestinationParamArray = new OdbcParameter [4]; + try { + OdbcCmd.Parameters.CopyTo (DestinationParamArray, -1); //index must be >= 0 + Assert.Fail ("Expected Exception ArgumentOutOfRangeException not thrown"); + } catch (ArgumentOutOfRangeException) { + Assert.AreEqual (null, DestinationParamArray [0], "#2 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [1], "#3 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [2], "#4 The DestinationParamArray must remain un-initialized"); + Assert.AreEqual (null, DestinationParamArray [3], "#5 The DestinationParamArray must remain un-initialized"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void DuplicateParameterNameTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcParameter p2Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 Collection should contain 2 parameters"); + + //Checking IndexOf (string) overload + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf ("@lname")); + + //Checking IndexOf (OdbcParameter) overload + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf (p1Lname)); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Lname)); + + //Checking IndexOf (object) overload + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf ((object) p1Lname)); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ((object) p2Lname)); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcCmd.Parameters.Remove (p1Lname); + Assert.AreEqual (0, OdbcCmd.Parameters.Count, "#2 Collection should not contain any parameters"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveNullTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Remove (null); + Assert.Fail ("Expected exception ArgumentNullException was not thrown"); + } catch (ArgumentNullException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only one parameter"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveEmptyTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Remove (string.Empty); + Assert.Fail ("Expected exception InvalidCastException was not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only one parameter"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveNonOdbcParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.Remove (4); + Assert.Fail ("Expected exception InvalidCastException was not thrown"); + } catch (InvalidCastException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain only one parameter"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveNonExistingParameterTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + /*OdbcParameter p2Age = new OdbcParameter ();*/ + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + OdbcCmd.Parameters.Remove (p1Lname); + Assert.AreEqual (0, OdbcCmd.Parameters.Count, "#2 Collection should not contain any parameters"); + try { + OdbcCmd.Parameters.Remove (p1Lname); + Assert.Fail ("Expected exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (0, OdbcCmd.Parameters.Count, "#3 The collection should not contain any parameters"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveParameterContainedInAnotherCollTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcCommand OdbcCmd2 = conn.CreateCommand (); + OdbcCmd2.CommandType = CommandType.Text; + OdbcCmd2.CommandText = "SELECT lname FROM employee WHERE fname=? AND age=?"; + + OdbcParameter p1 = OdbcCmd.Parameters.Add ("@p1", OdbcType.Text, 15); + /*OdbcParameter p2 = */OdbcCmd.Parameters.Add ("@p2", OdbcType.Text, 15); + + /*OdbcParameter p3 = */OdbcCmd2.Parameters.Add ("@p3", OdbcType.Text, 15); + /*OdbcParameter p4 = */OdbcCmd2.Parameters.Add ("@p4", OdbcType.Text, 15); + + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#5 The parameter collection of OdbcCmd should contain 2 parameters"); + Assert.AreEqual (2, OdbcCmd2.Parameters.Count, "#6 The parameter collection of OdbcCmd2 should contain 2 parameters"); + try { + OdbcCmd2.Parameters.Remove (p1); + Assert.Fail ("Expected Exception ArgumentException not thrown"); + } catch (ArgumentException) { + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#5 The parameter collection of OdbcCmd should contain 2 parameters"); + Assert.AreEqual (2, OdbcCmd2.Parameters.Count, "#6 The parameter collection of OdbcCmd2 should contain 2 parameters"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveAtTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter p2Age = OdbcCmd.Parameters.Add ("@age", OdbcType.Int, 2); + OdbcParameter p3Tmp = OdbcCmd.Parameters.Add ("@p3Tmp", OdbcType.Text, 15); + OdbcParameter p4Tmp = OdbcCmd.Parameters.Add ("@p4Tmp", OdbcType.Text, 15); + + Assert.AreEqual (4, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + Assert.AreEqual (true, OdbcCmd.Parameters.Contains(p1Lname), "#2 the collection does not contain p1Lname"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p1Lname), "#3 p1Lname is not at index 0"); + + //remove the first parameter + OdbcCmd.Parameters.RemoveAt (0); + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#4 Collection should contain only 3 parameters"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains(p1Lname), "#5 the collection should not contain p1Lname"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf(p1Lname), "#6 the collection should not contain p1Lname"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p2Age), "#7 p2Age should now be at index 0"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf(p3Tmp), "#8 p3Tmp should now be at index 1"); + Assert.AreEqual (2, OdbcCmd.Parameters.IndexOf(p4Tmp), "#9 p4Tmp should now be at index 2"); + + //remove the last parameter + OdbcCmd.Parameters.RemoveAt (OdbcCmd.Parameters.Count-1); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#10 Collection should contain only 2 parameters"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains(p4Tmp), "#11 the collection should not contain p4Tmp"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf(p4Tmp), "#12 the collection should not contain p4Tmp"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p2Age), "#13 p2Age should be at index 0"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf(p3Tmp), "#14 p3Tmp should be at index 1"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveAtOutOfRangeIndexTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.RemoveAt (9); + Assert.Fail ("Expected exception IndexOutOfRangeException not thrown"); + } catch (IndexOutOfRangeException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain 1 parameter"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains(p1Lname), "#3 the collection does not contain p1Lname"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p1Lname), "#4 p1Lname is not at index 0"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveAtNegativeIndexTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.RemoveAt (-1); + Assert.Fail ("Expected exception IndexOutOfRangeException not thrown"); + } catch (IndexOutOfRangeException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain 1 parameter"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains(p1Lname), "#3 the collection does not contain p1Lname"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p1Lname), "#4 p1Lname is not at index 0"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void RemoveAtBoundaryTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + OdbcParameter p1Lname = OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + try { + OdbcCmd.Parameters.RemoveAt (OdbcCmd.Parameters.Count); + Assert.Fail ("Expected exception IndexOutOfRangeException not thrown"); + } catch (IndexOutOfRangeException) { + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#2 The collection must contain 1 parameter"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains(p1Lname), "#3 the collection does not contain p1Lname"); + Assert.AreEqual (0, OdbcCmd.Parameters.IndexOf(p1Lname), "#4 p1Lname is not at index 0"); + } + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void AddWithValueTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + OdbcParameter rt = null; //to check return type + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + rt = OdbcCmd.Parameters.AddWithValue ("@P2", "Param2"); + Assert.AreEqual (typeof(OdbcParameter), rt.GetType(), "#1a AddWithValue didnt retuen type OdbcParameter"); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 AddWithValue failed for valid parameter name and value"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("@P2"), "#3 collection does not contain @P2"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ("@P2"), "#4 Index of added parameter must be 1"); + Assert.AreEqual ("Param2", OdbcCmd.Parameters["@P2"].Value, "#5 Value of added parameter must be Param2"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[1].OdbcType, "#6 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.AddWithValue ("@P2", "Param2ReAdded"); //adding again + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#7 AddWithValue must append at the end of the collection even for same parameter names"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("@P2"), "#8 collection does not contain @P2"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf ("@P2"), "#9 Index of @P2 must be 1"); + Assert.AreEqual ("Param2", OdbcCmd.Parameters["@P2"].Value, "#10 Value of added parameter must be Param2"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters["@P2"].OdbcType, "#11 Parameters with null value must be of type NVarChar"); + + //Two different parameters with same name but at different positions ie 1 and 2 + Assert.AreEqual ("@P2",OdbcCmd.Parameters[1].ParameterName, "#12 The parameter at index 1 must be @P2"); + Assert.AreEqual ("@P2",OdbcCmd.Parameters[2].ParameterName, "#13 The parameter at index 2 must be @P2"); + + //Confirming the parameters by checking their values + Assert.AreEqual ("Param2",OdbcCmd.Parameters[1].Value, "#14The parameter at index 1 must have value Param2"); + Assert.AreEqual ("Param2ReAdded",OdbcCmd.Parameters[2].Value, "#15The parameter at index 2 must have value Param2ReAdded"); + + //Testing for null values + OdbcCmd.Parameters.AddWithValue (null, null); + Assert.AreEqual (4, OdbcCmd.Parameters.Count, "#16 AddWithValue must accept null parameter names and null values"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains (null), "#17 AddWithValue must return false for Contains (null)"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (null), "#18 AddWithValue must return -1 for IndexOf (null)"); + Assert.AreEqual (null, OdbcCmd.Parameters["Parameter1"].Value, "#19 Value of added parameter must be null"); + Assert.AreEqual ("Parameter1",OdbcCmd.Parameters[3].ParameterName, "#20 The parameter at index 3 must be Parameter1"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[3].OdbcType, "#21 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.AddWithValue (null, null); //adding another null parameter + Assert.AreEqual (5, OdbcCmd.Parameters.Count, "#22 AddWithValue must accept null parameter names and null values"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains (null), "#23 AddWithValue must return false for Contains (null)"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (null), "#24 AddWithValue must return -1 for IndexOf (null)"); + Assert.AreEqual (null, OdbcCmd.Parameters["Parameter2"].Value, "#25 Value of added parameter must be null"); + Assert.AreEqual ("Parameter2",OdbcCmd.Parameters[4].ParameterName, "#26 The parameter at index 1 must be Parameter2"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[4].OdbcType, "#27 Parameters with null value must be of type NVarChar"); + + //Testing for empty strings + OdbcCmd.Parameters.AddWithValue ("", ""); //adding empty parameter + Assert.AreEqual (6, OdbcCmd.Parameters.Count, "#28 AddWithValue must accept empty names and empty values"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains (""), "#29 AddWithValue must return false for Contains ('')"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (""), "#30 AddWithValue must return -1 for IndexOf ('')"); + Assert.AreEqual ("Parameter3",OdbcCmd.Parameters[5].ParameterName, "#31 The parameter at index 5 must be Parameter3"); + Assert.AreEqual ("",OdbcCmd.Parameters[5].Value, "#32 The parameter at index 5 must have value as empty string"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[5].OdbcType, "#33 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.AddWithValue ("", ""); //adding another empty parameter + Assert.AreEqual (7, OdbcCmd.Parameters.Count, "#34 AddWithValue must accept empty names and empty values"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains (""), "#35 AddWithValue must return false for Contains ('')"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (""), "#36 AddWithValue must return -1 for IndexOf ('')"); + Assert.AreEqual ("Parameter4",OdbcCmd.Parameters[6].ParameterName, "#37 The parameter at index 6 must have name as Parameter4"); + Assert.AreEqual ("",OdbcCmd.Parameters[6].Value, "#38 The parameter at index 6 must have value as empty string"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[6].OdbcType, "#39 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.AddWithValue ("foo", null); + Assert.AreEqual (8, OdbcCmd.Parameters.Count, "#40 AddWithValue must accept string names and null values"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains ("foo"), "#41 AddWithValue must return true for Contains ('foo')"); + Assert.AreEqual (7, OdbcCmd.Parameters.IndexOf ("foo"), "#42 AddWithValue must return 7 for IndexOf ('foo')"); + Assert.AreEqual ("foo",OdbcCmd.Parameters[7].ParameterName, "#43 The parameter at index 7 must have name foo"); + Assert.AreEqual (null,OdbcCmd.Parameters[7].Value, "#44 The parameter at index 7 must have value as null"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[7].OdbcType, "#45 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.AddWithValue (null, 2); + Assert.AreEqual (9, OdbcCmd.Parameters.Count, "#46 AddWithValue must accept empty names and empty values"); + Assert.AreEqual (false, OdbcCmd.Parameters.Contains (null), "#47 AddWithValue must return false for Contains (null)"); + Assert.AreEqual (-1, OdbcCmd.Parameters.IndexOf (null), "#48 AddWithValue must return -1 for IndexOf ('')"); + Assert.AreEqual ("Parameter5",OdbcCmd.Parameters[8].ParameterName, "#49 The parameter at index 8 must have name as Parameter5"); + Assert.AreEqual (2,OdbcCmd.Parameters[8].Value, "#50 The parameter at index 8 must have value as 2"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[8].OdbcType, "#51 Parameter must be of type NVarChar"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + + [Test] + public void DefaultNamesAndValuesTest () + { + OdbcConnection conn = ConnectionManager.Instance.Odbc.Connection; + + try { + OdbcCommand OdbcCmd = conn.CreateCommand (); + OdbcCmd.CommandType = CommandType.Text; + OdbcCmd.CommandText = "SELECT fname FROM employee WHERE lname=? AND age=?"; + + /*OdbcParameter p1Lname = */OdbcCmd.Parameters.Add ("@lname", OdbcType.Text, 15); + Assert.AreEqual (1, OdbcCmd.Parameters.Count, "#1 Initialization error, the collection does not contain desired no. of parameters"); + + OdbcParameter p2Age = new OdbcParameter (); + OdbcParameter p3Tmp = new OdbcParameter (); + + OdbcCmd.Parameters.Add (p2Age); + Assert.AreEqual (2, OdbcCmd.Parameters.Count, "#2 The collection must contain 2 parameters"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains (p2Age), "#3 Collection does not contain p2Age"); + Assert.AreEqual (1, OdbcCmd.Parameters.IndexOf (p2Age), "#4 Index of p2Age must be 1"); + Assert.AreEqual (null, OdbcCmd.Parameters[1].Value, "#5 Value of added parameter must be null"); + Assert.AreEqual ("Parameter1",OdbcCmd.Parameters[1].ParameterName, "#6 The parameter must have a default name"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[1].OdbcType, "#7 Parameters with null value must be of type NVarChar"); + + OdbcCmd.Parameters.Insert (2,p3Tmp); + Assert.AreEqual (3, OdbcCmd.Parameters.Count, "#8 The collection must contain 3 parameters"); + Assert.AreEqual (true, OdbcCmd.Parameters.Contains (p3Tmp), "#9 Collection does not contain p3Tmp"); + Assert.AreEqual (2, OdbcCmd.Parameters.IndexOf (p3Tmp), "#10 Index of p3Tmp must be 2"); + Assert.AreEqual (null, OdbcCmd.Parameters[2].Value, "#11 Value of added parameter must be null"); + Assert.AreEqual ("Parameter2",OdbcCmd.Parameters[2].ParameterName, "#12 The parameter must have a default name"); + Assert.AreEqual (OdbcType.NVarChar,OdbcCmd.Parameters[2].OdbcType, "#13 Parameters with null value must be of type NVarChar"); + } finally { + ConnectionManager.Instance.Odbc.CloseConnection (); + } + } + } +} + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs.REMOVED.git-id b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs.REMOVED.git-id new file mode 100644 index 0000000000..045a6a99e5 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs.REMOVED.git-id @@ -0,0 +1 @@ +9cb09eac042bdf5010d77bfe1ccd2ee1563518cc \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlClientFactoryTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlClientFactoryTest.cs new file mode 100644 index 0000000000..816d24f5fd --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlClientFactoryTest.cs @@ -0,0 +1,58 @@ +// +// SqlDataAdapterTest.cs - NUnit Test Cases for testing the +// SqlDataAdapter class +// Author: +// Nidhi Rawal (rawalnidhi_rawal@yahoo.com) +// +// Copyright (c) 2007 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + + +using System; +using System.Data; +using System.Data.SqlClient; +using System.Net; +using NUnit.Framework; +using System.Collections; +using System.Security.Permissions; + +using System.Security; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("CAS")] + public class SqlClientFactoryTest + { + [Test] + public void CreatePermissionTest () + { + SqlClientFactory factory = SqlClientFactory.Instance; + CodeAccessPermission permission, perm; + permission = factory.CreatePermission (PermissionState.None); + perm = factory.CreatePermission (PermissionState.Unrestricted); + Assert.AreEqual (false, perm.IsSubsetOf (permission), "#1"); + } + } +} + diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs new file mode 100644 index 0000000000..a20abdff9c --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs @@ -0,0 +1,1462 @@ +// SqlCommandBuilderTest.cs - NUnit Test Cases for testing the +// SqlCommandBuilder class +// +// Authors: +// Sureshkumar T (tsureshkumar@novell.com) +// Veerapuram Varadhan (vvaradhan@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed on the +// ChangeLog entries. +// +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, copy, +// modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.SqlTypes; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlCommandBuilderTest + { + SqlConnection conn = null; + static EngineConfig engine; + + [TestFixtureSetUp] + public void init () + { + conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString); + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + private static EngineConfig Engine { + get { + return engine; + } + } + + [SetUp] + public void Setup () + { + conn.Open (); + } + + [TearDown] + public void TearDown () + { + conn?.Close (); + } + + [Test] + [Category("NotWorking")] + public void GetInsertCommand1 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname " + + "from employee where id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO [employee] ([id], " + + "[fname], [lname]) VALUES (@p1, @p2, @p3)", + cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertInsertParameters (cmd, false, "#A3:"); + Assert.AreSame (cmd, cb.GetInsertCommand (), "#A4"); + + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO \"employee] (\"id], " + + "\"fname], \"lname]) VALUES (@p1, @p2, @p3)", + cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertInsertParameters (cmd, false, "#B3:"); + Assert.AreSame (cmd, cb.GetInsertCommand (), "#B4"); + + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO \"employee\" (\"id\", " + + "\"fname\", \"lname\") VALUES (@p1, @p2, @p3)", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertInsertParameters (cmd, false, "#C3"); + Assert.AreSame (cmd, cb.GetInsertCommand (), "#C4"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + [Category("NotWorking")] + public void GetInsertCommand1_Expression () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname, " + + "id+1 as next_id from employee where " + + "id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("INSERT INTO [employee] " + + "([id], [fname], [lname]) VALUES " + + "(@p1, @p2, @p3)", cmd.CommandText, "#1"); + Assert.AreSame (conn, cmd.Connection, "#2"); + AssertInsertParameters (cmd, false, "#3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetInsertCommand (Boolean) + [Category("NotWorking")] + public void GetInsertCommand2 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname " + + "from employee where id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (true); + Assert.AreEqual ("INSERT INTO [employee] ([id], " + + "[fname], [lname]) VALUES (@id, @fname, " + + "@lname)", cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertInsertParameters (cmd, true, "#A3:"); + + cmd = cb.GetInsertCommand (false); + Assert.AreEqual ("INSERT INTO [employee] ([id], " + + "[fname], [lname]) VALUES (@id, @fname, " + + "@lname)", cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertInsertParameters (cmd, true, "#B3:"); + + cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (false); + Assert.AreEqual ("INSERT INTO [employee] ([id], " + + "[fname], [lname]) VALUES (@p1, @p2, @p3)", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertInsertParameters (cmd, false, "#C3:"); + + cmd = cb.GetInsertCommand (true); + Assert.AreEqual ("INSERT INTO [employee] ([id], " + + "[fname], [lname]) VALUES (@id, @fname, " + + "@lname)", cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertInsertParameters (cmd, true, "#D3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand () + [Category("NotWorking")] + public void GetUpdateCommand1 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname, " + + "id+1 as next_id from employee where " + + "id = 3 and lname = 'A' and fname = 'B'"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE [employee] SET [id] = @p1, " + + "[fname] = @p2, [lname] = @p3 WHERE (([id] = @p4) " + + "AND ([fname] = @p5) AND ((@p6 = 1 " + + "AND [lname] IS NULL) OR ([lname] = @p7)))", + cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertUpdateParameters (cmd, false, "#A3:"); + Assert.AreSame (cmd, cb.GetUpdateCommand (), "#A4"); + + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE \"employee] SET \"id] = @p1, " + + "\"fname] = @p2, \"lname] = @p3 WHERE ((\"id] = @p4) " + + "AND (\"fname] = @p5) AND ((@p6 = 1 " + + "AND \"lname] IS NULL) OR (\"lname] = @p7)))", + cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertUpdateParameters (cmd, false, "#B3:"); + Assert.AreSame (cmd, cb.GetUpdateCommand (), "#B4"); + + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE \"employee\" SET \"id\" = @p1, " + + "\"fname\" = @p2, \"lname\" = @p3 WHERE ((\"id\" = @p4) " + + "AND (\"fname\" = @p5) AND ((@p6 = 1 " + + "AND \"lname\" IS NULL) OR (\"lname\" = @p7)))", + cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertUpdateParameters (cmd, false, "#C3:"); + Assert.AreSame (cmd, cb.GetUpdateCommand (), "#C4"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand () + public void GetUpdateCommand1_AutoIncrement () + { + if (ClientVersion == 7) + Assert.Ignore ("Key information is not available for temporary tables."); + + SqlCommand cmd = null; + + try { + cmd = conn.CreateCommand (); + cmd.CommandText = "create table #tmp_table (id int primary key , counter int identity(1,1), value varchar(10))"; + cmd.ExecuteNonQuery (); + + string selectQuery = "select id, counter, value, id+1 as next_id from #tmp_table"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds); + Assert.AreEqual (1, ds.Tables.Count); + Assert.AreEqual (4, ds.Tables [0].Columns.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("UPDATE [#tmp_table] SET [id] = @p1, " + + "[value] = @p2 WHERE (([id] = @p3) AND (" + + "[counter] = @p4) AND ((@p5 = 1 AND [value] IS NULL) " + + "OR ([value] = @p6)))", cmd.CommandText, "#1"); + Assert.AreEqual (6, cmd.Parameters.Count, "#2"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand () + public void GetUpdateCommand1_CheckParameters () + { + SqlCommand cmd = null; + + try { + SqlDataAdapter adapter = new SqlDataAdapter ( + "select id, type_varchar from string_family", + conn); + SqlCommandBuilder cb = new SqlCommandBuilder (adapter); + + cmd = cb.GetUpdateCommand (); + Assert.AreEqual (5, cmd.Parameters.Count, "#1"); + Assert.AreEqual (SqlDbType.Int, cmd.Parameters ["@p4"].SqlDbType, "#2"); + Assert.AreEqual (1, cmd.Parameters ["@p4"].Value, "#3"); + + cmd = cb.GetDeleteCommand (); + Assert.AreEqual (3, cmd.Parameters.Count, "#4"); + Assert.AreEqual (SqlDbType.Int, cmd.Parameters ["@p2"].SqlDbType, "#5"); + Assert.AreEqual (1, cmd.Parameters ["@p2"].Value, "#6"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand (Boolean) + [Category("NotWorking")] + public void GetUpdateCommand2 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname, id+1 as next_id from employee where id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (true); + Assert.AreEqual ("UPDATE [employee] SET [id] = @id, " + + "[fname] = @fname, [lname] = @lname WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertUpdateParameters (cmd, true, "#A3:"); + + cmd = cb.GetUpdateCommand (false); + Assert.AreEqual ("UPDATE [employee] SET [id] = @id, " + + "[fname] = @fname, [lname] = @lname WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertUpdateParameters (cmd, true, "#B3:"); + + cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (false); + Assert.AreEqual ("UPDATE [employee] SET [id] = @p1, " + + "[fname] = @p2, [lname] = @p3 WHERE " + + "(([id] = @p4) AND ([fname] = @p5) AND " + + "((@p6 = 1 AND [lname] IS NULL) OR " + + "([lname] = @p7)))", cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertUpdateParameters (cmd, false, "#C3:"); + + cmd = cb.GetUpdateCommand (true); + Assert.AreEqual ("UPDATE [employee] SET [id] = @id, " + + "[fname] = @fname, [lname] = @lname WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertUpdateParameters (cmd, true, "#D3:"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand (Boolean) + public void GetUpdateCommand2_AutoIncrement () + { + SqlCommand cmd = null; + + try { + cmd = conn.CreateCommand (); + cmd.CommandText = "create table #tmp_table (id int primary key , counter int identity(1,1), value varchar(10))"; + cmd.ExecuteNonQuery (); + + string selectQuery = "select id, counter, value, id+1 as next_id from #tmp_table"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds); + Assert.AreEqual (1, ds.Tables.Count); + Assert.AreEqual (4, ds.Tables [0].Columns.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (true); + Assert.AreEqual ("UPDATE [#tmp_table] SET [id] = @id, " + + "[value] = @value WHERE (([id] = @Original_id) " + + "AND ([counter] = @Original_counter) AND " + + "((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#A1"); + Assert.AreEqual (6, cmd.Parameters.Count, "#A2"); + + cmd = cb.GetUpdateCommand (false); + Assert.AreEqual ("UPDATE [#tmp_table] SET [id] = @id, " + + "[value] = @value WHERE (([id] = @Original_id) " + + "AND ([counter] = @Original_counter) AND " + + "((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#B1"); + Assert.AreEqual (6, cmd.Parameters.Count, "#B2"); + + cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (false); + Assert.AreEqual ("UPDATE [#tmp_table] SET [id] = @p1, " + + "[value] = @p2 WHERE (([id] = @p3) " + + "AND ([counter] = @p4) AND ((@p5 = 1 " + + "AND [value] IS NULL) OR ([value] = @p6)))", + cmd.CommandText, "#C1"); + Assert.AreEqual (6, cmd.Parameters.Count, "#C2"); + + cmd = cb.GetUpdateCommand (true); + Assert.AreEqual ("UPDATE [#tmp_table] SET [id] = @id, " + + "[value] = @value WHERE (([id] = @Original_id) " + + "AND ([counter] = @Original_counter) AND " + + "((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#D1"); + Assert.AreEqual (6, cmd.Parameters.Count, "#D2"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetUpdateCommand (Boolean) + public void GetUpdateDeleteCommand2_CheckParameters () + { + SqlCommand cmd = null; + + try { + SqlDataAdapter adapter = new SqlDataAdapter ( + "select id, type_varchar from string_family", + conn); + SqlCommandBuilder cb = new SqlCommandBuilder (adapter); + + SqlCommand updateCommand = cb.GetUpdateCommand (true); + Assert.AreEqual (5, updateCommand.Parameters.Count, "#A1"); + Assert.AreEqual (SqlDbType.VarChar, updateCommand.Parameters ["@type_varchar"].SqlDbType, "#A2"); + // FIXME: NotWorking + //Assert.AreEqual (1, updateCommand.Parameters ["@type_char"].Value, "#A3"); + + SqlCommand delCommand = cb.GetDeleteCommand (true); + Assert.AreEqual (3, delCommand.Parameters.Count, "#B"); + Assert.AreEqual (DbType.Int32, delCommand.Parameters [0].DbType, "#B: DbType (0)"); + Assert.AreEqual ("@Original_id", delCommand.Parameters [0].ParameterName, "#B: ParameterName (0)"); + Assert.AreEqual ("id", delCommand.Parameters [0].SourceColumn, "#B: SourceColumn (0)"); + Assert.AreEqual (SqlDbType.Int, delCommand.Parameters [0].SqlDbType, "#B: SqlDbType (0)"); + Assert.IsNull (delCommand.Parameters [0].Value, "#B: Value (0)"); + + Assert.AreEqual (DbType.Int32, delCommand.Parameters [1].DbType, "#B: DbType (1)"); + Assert.AreEqual ("@IsNull_type_varchar", delCommand.Parameters [1].ParameterName, "#B: ParameterName (1)"); + Assert.AreEqual ("type_varchar", delCommand.Parameters [1].SourceColumn, "#B: SourceColumn (1)"); + Assert.AreEqual (SqlDbType.Int, delCommand.Parameters [1].SqlDbType, "#B: SqlDbType (1)"); + Assert.AreEqual (1, delCommand.Parameters [1].Value, "#B: Value (1)"); + + Assert.AreEqual (DbType.AnsiString, delCommand.Parameters [2].DbType, "#B: DbType (2)"); + Assert.AreEqual ("@Original_type_varchar", delCommand.Parameters [2].ParameterName, "#B: ParameterName (2)"); + Assert.AreEqual ("type_varchar", delCommand.Parameters [2].SourceColumn, "#B: SourceColumn (2)"); + Assert.AreEqual (SqlDbType.VarChar, delCommand.Parameters [2].SqlDbType, "#B: SqlDbType (2)"); + Assert.IsNull (delCommand.Parameters [2].Value, "#B: Value (2)"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + [Category("NotWorking")] + public void GetUpdateCommandDBConcurrencyExceptionTest () + { + string selectQuery = "select id, fname from employee where id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + Assert.IsNotNull (cb); + + DataRow [] rows = ds.Tables [0].Select ("id=1"); + rows [0] [0] = 6660; // non existent + ds.Tables [0].AcceptChanges (); // moves 6660 to original value + rows [0] [0] = 1; // moves 6660 as search key into db table + try { + da.Update (rows); + Assert.Fail ("#1"); + } catch (DBConcurrencyException ex) { + // Concurrency violation: the UpdateCommand + // affected 0 of the expected 1 records + Assert.AreEqual (typeof (DBConcurrencyException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreSame (rows [0], ex.Row, "#6"); + Assert.AreEqual (1, ex.RowCount, "#7"); + } + } + + [Test] + [Category("NotWorking")] + public void GetDeleteCommandDBConcurrencyExceptionTest () + { + string selectQuery = "select id, fname from employee where id = 1"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + Assert.IsNotNull (cb); + + DataRow [] rows = ds.Tables [0].Select ("id=1"); + rows [0] [0] = 6660; // non existent + ds.Tables [0].AcceptChanges (); // moves 6660 to original value + rows [0].Delete (); // moves 6660 as search key into db table + try { + da.Update (rows); + Assert.Fail ("#1"); + } catch (DBConcurrencyException ex) { + // Concurrency violation: the DeleteCommand + // affected 0 of the expected 1 records + Assert.AreEqual (typeof (DBConcurrencyException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.AreSame (rows [0], ex.Row, "#5"); + Assert.AreEqual (1, ex.RowCount, "#6"); + } + } + + [Test] // GetDeleteCommand () + [Category("NotWorking")] + public void GetDeleteCommand1 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname, " + + "id+2 as next_id from employee where " + + "id = 3 and lname = 'A' and fname = 'B'"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("DELETE FROM [employee] WHERE " + + "(([id] = @p1) AND ([fname] = @p2) AND " + + "((@p3 = 1 AND [lname] IS NULL) OR " + + "([lname] = @p4)))", cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertDeleteParameters (cmd, false, "#A3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (), "#A4"); + + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + cmd = cb.GetDeleteCommand (); + + Assert.AreEqual ("DELETE FROM \"employee] WHERE " + + "((\"id] = @p1) AND (\"fname] = @p2) AND " + + "((@p3 = 1 AND \"lname] IS NULL) OR " + + "(\"lname] = @p4)))", cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertDeleteParameters (cmd, false, "#B3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (), "#B4"); + + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + cmd = cb.GetDeleteCommand (); + + Assert.AreEqual ("DELETE FROM \"employee\" WHERE " + + "((\"id\" = @p1) AND (\"fname\" = @p2) AND " + + "((@p3 = 1 AND \"lname\" IS NULL) OR " + + "(\"lname\" = @p4)))", cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertDeleteParameters (cmd, false, "#C3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (), "#C4"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetDeleteCommand () + public void GetDeleteCommand1_AutoIncrement () + { + if (ClientVersion == 7) + Assert.Ignore ("Key information is not available for temporary tables."); + + SqlCommand cmd = null; + + try { + cmd = conn.CreateCommand (); + cmd.CommandText = "create table #tmp_table (id int primary key , counter int identity(1,1), value varchar(10))"; + cmd.ExecuteNonQuery (); + + string selectQuery = "select id, counter, value, id+1 as next_id from #tmp_table"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds); + Assert.AreEqual (1, ds.Tables.Count); + Assert.AreEqual (4, ds.Tables [0].Columns.Count); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("DELETE FROM [#tmp_table] WHERE " + + "(([id] = @p1) AND ([counter] = @p2) AND " + + "((@p3 = 1 AND [value] IS NULL) OR ([value] = @p4)))", + cmd.CommandText, "#1"); + Assert.AreEqual (4, cmd.Parameters.Count, "#2"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetDeleteCommand () + public void GetDeleteCommand1_CheckParameters () + { + SqlCommand cmd = null; + + try { + SqlDataAdapter adapter = new SqlDataAdapter ( + "select id, type_varchar from string_family", + conn); + SqlCommandBuilder cb = new SqlCommandBuilder (adapter); + + cmd = cb.GetDeleteCommand (); + Assert.AreEqual (3, cmd.Parameters.Count, "#1"); + Assert.AreEqual (SqlDbType.Int, cmd.Parameters ["@p2"].SqlDbType, "#2"); + Assert.AreEqual (1, cmd.Parameters ["@p2"].Value, "#3"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetDeleteCommand () + [Category("NotWorking")] + public void GetDeleteCommand2 () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, fname, lname, id+2 as next_id from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + Assert.AreEqual (1, ds.Tables.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (true); + Assert.AreEqual ("DELETE FROM [employee] WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#A1"); + Assert.AreSame (conn, cmd.Connection, "#A2"); + AssertDeleteParameters (cmd, true, "#A3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (true), "#A4"); + + cmd = cb.GetDeleteCommand (false); + Assert.AreEqual ("DELETE FROM [employee] WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#B1"); + Assert.AreSame (conn, cmd.Connection, "#B2"); + AssertDeleteParameters (cmd, true, "#B3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (false), "#B4"); + + cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (false); + Assert.AreEqual ("DELETE FROM [employee] WHERE " + + "(([id] = @p1) AND ([fname] = @p2) AND " + + "((@p3 = 1 AND [lname] IS NULL) OR " + + "([lname] = @p4)))", cmd.CommandText, "#C1"); + Assert.AreSame (conn, cmd.Connection, "#C2"); + AssertDeleteParameters (cmd, false, "#C3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (false), "#C4"); + + cmd = cb.GetDeleteCommand (true); + Assert.AreEqual ("DELETE FROM [employee] WHERE " + + "(([id] = @Original_id) AND ([fname] = " + + "@Original_fname) AND ((@IsNull_lname = 1 " + + "AND [lname] IS NULL) OR ([lname] = " + + "@Original_lname)))", cmd.CommandText, "#D1"); + Assert.AreSame (conn, cmd.Connection, "#D2"); + AssertDeleteParameters (cmd, true, "#D3:"); + Assert.AreSame (cmd, cb.GetDeleteCommand (false), "#D4"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] // GetDeleteCommand (Boolean) + public void GetDeleteCommand2_AutoIncrement () + { + SqlCommand cmd = null; + + try { + cmd = conn.CreateCommand (); + cmd.CommandText = "create table #tmp_table (id int primary key , counter int identity(1,1), value varchar(10))"; + cmd.ExecuteNonQuery (); + + string selectQuery = "select id, counter, value, id+1 as next_id from #tmp_table"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds); + Assert.AreEqual (1, ds.Tables.Count); + Assert.AreEqual (4, ds.Tables [0].Columns.Count); + + SqlCommandBuilder cb; + + cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (true); + Assert.AreEqual ("DELETE FROM [#tmp_table] WHERE " + + "(([id] = @Original_id) AND ([counter] = @Original_counter) " + + "AND ((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#A1"); + Assert.AreEqual (4, cmd.Parameters.Count, "#A2"); + + cmd = cb.GetDeleteCommand (false); + Assert.AreEqual ("DELETE FROM [#tmp_table] WHERE " + + "(([id] = @Original_id) AND ([counter] = @Original_counter) " + + "AND ((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#B1"); + Assert.AreEqual (4, cmd.Parameters.Count, "#B2"); + + cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (false); + Assert.AreEqual ("DELETE FROM [#tmp_table] WHERE " + + "(([id] = @p1) AND ([counter] = @p2) " + + "AND ((@p3 = 1 AND [value] IS NULL) " + + "OR ([value] = @p4)))", + cmd.CommandText, "#C1"); + Assert.AreEqual (4, cmd.Parameters.Count, "#C2"); + + cmd = cb.GetDeleteCommand (true); + Assert.AreEqual ("DELETE FROM [#tmp_table] WHERE " + + "(([id] = @Original_id) AND ([counter] = @Original_counter) " + + "AND ((@IsNull_value = 1 AND [value] IS NULL) " + + "OR ([value] = @Original_value)))", + cmd.CommandText, "#D1"); + Assert.AreEqual (4, cmd.Parameters.Count, "#D2"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + [Category("NotWorking")] + public void DefaultProperties () + { + SqlCommandBuilder cb = new SqlCommandBuilder (); + Assert.AreEqual ("[", cb.QuotePrefix, "#5"); + Assert.AreEqual ("]", cb.QuoteSuffix, "#6"); + Assert.AreEqual (".", cb.CatalogSeparator, "#2"); + //Assert.AreEqual ("", cb.DecimalSeparator, "#3"); + Assert.AreEqual (".", cb.SchemaSeparator, "#4"); + Assert.AreEqual (CatalogLocation.Start, cb.CatalogLocation, "#1"); + Assert.AreEqual ("[monotest]", cb.QuoteIdentifier ("monotest"), "#7"); + Assert.AreEqual ("\"monotest\"", cb.UnquoteIdentifier ("\"monotest\""), "#8"); + //Assert.AreEqual (cb.ConflictOption.CompareAllSearchableValues, cb.ConflictDetection); + // FIXME: test SetAllValues + } + + // FIXME: Add tests for examining RowError + // FIXME: Add test for ContinueUpdateOnError property + + [Test] + public void CheckParameters_BuiltCommand () + { + SqlDataAdapter adapter = new SqlDataAdapter ("select id,type_varchar from string_family", conn); + SqlCommandBuilder cb = new SqlCommandBuilder(adapter); + DataSet ds = new DataSet (); + adapter.Fill(ds); + + Assert.AreEqual (2, cb.GetInsertCommand().Parameters.Count, "#1"); + + DataRow row_rsInput = ds.Tables[0].NewRow(); + row_rsInput["id"] = 100; + row_rsInput["type_varchar"] = "ttt"; + ds.Tables[0].Rows.Add(row_rsInput); + + Assert.AreEqual (2, cb.GetInsertCommand().Parameters.Count, "#2"); + + row_rsInput = ds.Tables[0].NewRow(); + row_rsInput["id"] = 101; + row_rsInput["type_varchar"] = "ttt"; + ds.Tables[0].Rows.Add(row_rsInput); + + Assert.AreEqual (2, cb.GetInsertCommand().Parameters.Count, "#3"); + } + + [Test] + public void DeriveParameters () + { + SqlCommand cmd = null; + SqlParameter param; + + try { + cmd = conn.CreateCommand (); + cmd.CommandText = "sp_326182a"; + cmd.CommandType = CommandType.StoredProcedure; + cmd.CommandTimeout = 90; + cmd.Parameters.Add ("dummy", SqlDbType.Image, 5); + + SqlCommandBuilder.DeriveParameters (cmd); + Assert.AreEqual (5, cmd.Parameters.Count, "#A1"); + + cmd = conn.CreateCommand (); + cmd.CommandText = "sp_326182b"; + cmd.CommandType = CommandType.StoredProcedure; + cmd.CommandTimeout = 90; + cmd.Parameters.Add ("dummy", SqlDbType.Image, 5); + + SqlCommandBuilder.DeriveParameters (cmd); + Assert.AreEqual (4, cmd.Parameters.Count, "#A"); + + param = cmd.Parameters [0]; + Assert.AreEqual (ParameterDirection.ReturnValue, param.Direction, "#B:Direction"); + Assert.IsFalse (param.IsNullable, "#B:IsNullable"); + if (ClientVersion == 7) + Assert.AreEqual ("RETURN_VALUE", param.ParameterName, "#B:ParameterName"); + else + Assert.AreEqual ("@RETURN_VALUE", param.ParameterName, "#B:ParameterName"); + Assert.AreEqual (0, param.Precision, "#B:Precision"); + Assert.AreEqual (0, param.Scale, "#B:Scale"); + //Assert.AreEqual (0, param.Size, "#B:Size"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, "#B:SqlDbType"); + Assert.IsNull (param.Value, "#B:Value"); + + param = cmd.Parameters [1]; + Assert.AreEqual (ParameterDirection.Input, param.Direction, "#C:Direction"); + Assert.IsFalse (param.IsNullable, "#C:IsNullable"); + Assert.AreEqual ("@param0", param.ParameterName, "#C:ParameterName"); + Assert.AreEqual (0, param.Precision, "#C:Precision"); + Assert.AreEqual (0, param.Scale, "#C:Scale"); + //Assert.AreEqual (0, param.Size, "#C:Size"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, "#C:SqlDbType"); + Assert.IsNull (param.Value, "#C:Value"); + + param = cmd.Parameters [2]; + Assert.AreEqual (ParameterDirection.InputOutput, param.Direction, "#D:Direction"); + Assert.IsFalse (param.IsNullable, "#D:IsNullable"); + Assert.AreEqual ("@param1", param.ParameterName, "#D:ParameterName"); + Assert.AreEqual (5, param.Precision, "#D:Precision"); + Assert.AreEqual (2, param.Scale, "#D:Scale"); + //Assert.AreEqual (0, param.Size, "#D:Size"); + Assert.AreEqual (SqlDbType.Decimal, param.SqlDbType, "#D:SqlDbType"); + Assert.IsNull (param.Value, "#D:Value"); + + param = cmd.Parameters [3]; + Assert.AreEqual (ParameterDirection.Input, param.Direction, "#E:Direction"); + Assert.IsFalse (param.IsNullable, "#E:IsNullable"); + Assert.AreEqual ("@param2", param.ParameterName, "#E:ParameterName"); + Assert.AreEqual (0, param.Precision, "#E:Precision"); + Assert.AreEqual (0, param.Scale, "#E:Scale"); + Assert.AreEqual (12, param.Size, "#E:Size"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, "#E:SqlDbType"); + Assert.IsNull (param.Value, "#E:Value"); + + cmd.Parameters ["@param0"].Value = 5; + cmd.Parameters ["@param1"].Value = 4.000m; + cmd.Parameters ["@param2"].Value = DBNull.Value; + cmd.ExecuteNonQuery (); + if (ClientVersion == 7) + Assert.AreEqual (666, cmd.Parameters ["RETURN_VALUE"].Value, "#F1"); + else + Assert.AreEqual (666, cmd.Parameters ["@RETURN_VALUE"].Value, "#F1"); + Assert.AreEqual (5, cmd.Parameters ["@param0"].Value, "#F2"); + Assert.AreEqual (11m, cmd.Parameters ["@param1"].Value, "#F3"); + Assert.AreEqual (DBNull.Value, cmd.Parameters ["@param2"].Value, "#F4"); + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuotePrefix_DeleteCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("[", cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("[", cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuotePrefix_InsertCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("[", cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("[", cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuotePrefix_UpdateCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("[", cb.QuotePrefix, "#1"); + try { + cb.QuotePrefix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("[", cb.QuotePrefix, "#6"); + cb.RefreshSchema (); + cb.QuotePrefix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuoteSuffix_DeleteCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetDeleteCommand (); + Assert.AreEqual ("]", cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("]", cb.QuoteSuffix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuoteSuffix_InsertCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetInsertCommand (); + Assert.AreEqual ("]", cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("]", cb.QuoteSuffix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + [Test] + public void QuoteSuffix_UpdateCommand_Generated () + { + SqlCommand cmd = null; + + try { + string selectQuery = "select id, lname from employee where id = 3"; + SqlDataAdapter da = new SqlDataAdapter (selectQuery, conn); + DataSet ds = new DataSet (); + da.Fill (ds, "IntTest"); + + SqlCommandBuilder cb = new SqlCommandBuilder (da); + cmd = cb.GetUpdateCommand (); + Assert.AreEqual ("]", cb.QuoteSuffix, "#1"); + try { + cb.QuoteSuffix = "\""; + Assert.Fail ("#2"); + } catch (InvalidOperationException ex) { + // The QuotePrefix and QuoteSuffix properties + // cannot be changed once an Insert, Update, or + // Delete command has been generated + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + } + Assert.AreEqual ("]", cb.QuoteSuffix, "#6"); + cb.RefreshSchema (); + cb.QuoteSuffix = "\""; + } finally { + if (cmd != null) + cmd.Dispose (); + } + } + + static void AssertDeleteParameters (SqlCommand cmd, bool useColumnsForParameterNames, string prefix) + { + SqlParameter param; + + Assert.AreEqual (4, cmd.Parameters.Count, prefix + "Count"); + + param = cmd.Parameters [0]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (0)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (0)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (0)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (0)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_id", param.ParameterName, prefix + "ParameterName (0)"); + else + Assert.AreEqual ("@p1", param.ParameterName, prefix + "ParameterName (0)"); + + Assert.AreEqual (10, param.Precision, prefix + "Precision (0)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (0)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (0)"); + Assert.AreEqual ("id", param.SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (0)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (0)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (0)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (0)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (0)"); + Assert.IsNull (param.Value, prefix + "Value (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (0)"); + + + param = cmd.Parameters [1]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (2)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (2)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (2)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (2)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_fname", param.ParameterName, prefix + "ParameterName (2)"); + else + Assert.AreEqual ("@p2", param.ParameterName, prefix + "ParameterName (2)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (2)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (2)"); + Assert.AreEqual (0, param.Size, prefix + "Size (2)"); + Assert.AreEqual ("fname", param.SourceColumn, prefix + "SourceColumn (2)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (2)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (2)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (2)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (2)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (2)"); + Assert.IsNull (param.Value, prefix + "Value (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (2)"); + + param = cmd.Parameters [2]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (3)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (3)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (3)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (3)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@IsNull_lname", param.ParameterName, prefix + "ParameterName (3)"); + else + Assert.AreEqual ("@p3", param.ParameterName, prefix + "ParameterName (3)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (3)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (3)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (3)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (3)"); + Assert.IsTrue (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (3)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (3)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (3)"); + Assert.AreEqual (new SqlInt32 (1), param.SqlValue, prefix + "SqlValue (3)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (3)"); + Assert.AreEqual (1, param.Value, prefix + "Value (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (3)"); + + param = cmd.Parameters [3]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (4)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (4)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (4)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (4)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_lname", param.ParameterName, prefix + "ParameterName (4)"); + else + Assert.AreEqual ("@p4", param.ParameterName, prefix + "ParameterName (4)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (4)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (4)"); + Assert.AreEqual (0, param.Size, prefix + "Size (4)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (4)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (4)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (4)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (4)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (4)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (4)"); + Assert.IsNull (param.Value, prefix + "Value (4)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (4)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (4)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (4)"); + } + + static void AssertInsertParameters (SqlCommand cmd, bool useColumnsForParameterNames, string prefix) + { + SqlParameter param; + + Assert.AreEqual (3, cmd.Parameters.Count, prefix + "Count"); + + param = cmd.Parameters [0]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (0)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (0)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (0)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (0)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@id", param.ParameterName, prefix + "ParameterName (0)"); + else + Assert.AreEqual ("@p1", param.ParameterName, prefix + "ParameterName (0)"); + + Assert.AreEqual (10, param.Precision, prefix + "Precision (0)"); + + Assert.AreEqual (0, param.Scale, prefix + "Scale (0)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (0)"); + Assert.AreEqual ("id", param.SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (0)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (0)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (0)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (0)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (0)"); + Assert.IsNull (param.Value, prefix + "Value (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (0)"); + + param = cmd.Parameters [1]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (1)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (1)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (1)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (1)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@fname", param.ParameterName, prefix + "ParameterName (1)"); + else + Assert.AreEqual ("@p2", param.ParameterName, prefix + "ParameterName (1)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (1)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (1)"); + Assert.AreEqual (0, param.Size, prefix + "Size (1)"); + Assert.AreEqual ("fname", param.SourceColumn, prefix + "SourceColumn (1)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (1)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (1)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (1)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (1)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (1)"); + Assert.IsNull (param.Value, prefix + "Value (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (1)"); + + param = cmd.Parameters [2]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (2)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (2)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (2)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (2)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@lname", param.ParameterName, prefix + "ParameterName (2)"); + else + Assert.AreEqual ("@p3", param.ParameterName, prefix + "ParameterName (2)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (2)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (2)"); + Assert.AreEqual (0, param.Size, prefix + "Size (2)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (2)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (2)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (2)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (2)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (2)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (2)"); + Assert.IsNull (param.Value, prefix + "Value (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (2)"); + } + + static void AssertUpdateParameters (SqlCommand cmd, bool useColumnsForParameterNames, string prefix) + { + SqlParameter param; + + Assert.AreEqual (7, cmd.Parameters.Count, prefix + "Count"); + + param = cmd.Parameters [0]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (0)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (0)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (0)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (0)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@id", param.ParameterName, prefix + "ParameterName (0)"); + else + Assert.AreEqual ("@p1", param.ParameterName, prefix + "ParameterName (0)"); + + Assert.AreEqual (10, param.Precision, prefix + "Precision (0)"); + + Assert.AreEqual (0, param.Scale, prefix + "Scale (0)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (0)"); + Assert.AreEqual ("id", param.SourceColumn, prefix + "SourceColumn (0)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (0)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (0)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (0)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (0)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (0)"); + Assert.IsNull (param.Value, prefix + "Value (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (0)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (0)"); + + param = cmd.Parameters [1]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (1)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (1)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (1)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (1)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@fname", param.ParameterName, prefix + "ParameterName (1)"); + else + Assert.AreEqual ("@p2", param.ParameterName, prefix + "ParameterName (1)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (1)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (1)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (1)"); + Assert.AreEqual ("fname", param.SourceColumn, prefix + "SourceColumn (1)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (1)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (1)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (1)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (1)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (1)"); + Assert.IsNull (param.Value, prefix + "Value (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (1)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (1)"); + + param = cmd.Parameters [2]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (2)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (2)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (2)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (2)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@lname", param.ParameterName, prefix + "ParameterName (2)"); + else + Assert.AreEqual ("@p3", param.ParameterName, prefix + "ParameterName (2)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (2)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (2)"); + Assert.AreEqual (0, param.Size, prefix + "Size (2)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (2)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (2)"); + Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (2)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (2)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (2)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (2)"); + Assert.IsNull (param.Value, prefix + "Value (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (2)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (2)"); + + param = cmd.Parameters [3]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (3)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (3)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (3)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (3)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_id", param.ParameterName, prefix + "ParameterName (3)"); + else + Assert.AreEqual ("@p4", param.ParameterName, prefix + "ParameterName (3)"); + + Assert.AreEqual (10, param.Precision, prefix + "Precision (0)"); + + Assert.AreEqual (0, param.Scale, prefix + "Scale (3)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (3)"); + Assert.AreEqual ("id", param.SourceColumn, prefix + "SourceColumn (3)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (3)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (3)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (3)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (3)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (3)"); + Assert.IsNull (param.Value, prefix + "Value (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (3)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (3)"); + + + param = cmd.Parameters [4]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (5)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (5)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (5)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (5)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_fname", param.ParameterName, prefix + "ParameterName (5)"); + else + Assert.AreEqual ("@p5", param.ParameterName, prefix + "ParameterName (5)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (5)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (5)"); + Assert.AreEqual (0, param.Size, prefix + "Size (5)"); + Assert.AreEqual ("fname", param.SourceColumn, prefix + "SourceColumn (5)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (5)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (5)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (5)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (5)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (5)"); + Assert.IsNull (param.Value, prefix + "Value (5)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (5)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (5)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (5)"); + + param = cmd.Parameters [5]; + Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (6)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (6)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (6)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (6)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@IsNull_lname", param.ParameterName, prefix + "ParameterName (6)"); + else + Assert.AreEqual ("@p6", param.ParameterName, prefix + "ParameterName (6)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (6)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (6)"); + //Assert.AreEqual (0, param.Size, prefix + "Size (6)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (6)"); + Assert.IsTrue (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (6)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (6)"); + Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (6)"); + Assert.AreEqual (new SqlInt32 (1), param.SqlValue, prefix + "SqlValue (6)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (6)"); + Assert.AreEqual (1, param.Value, prefix + "Value (6)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (6)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (6)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (6)"); + + param = cmd.Parameters [6]; + Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (7)"); + Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (7)"); + Assert.IsFalse (param.IsNullable, prefix + "IsNullable (7)"); + Assert.AreEqual (0, param.Offset, prefix + "Offset (7)"); + if (useColumnsForParameterNames) + Assert.AreEqual ("@Original_lname", param.ParameterName, prefix + "ParameterName (7)"); + else + Assert.AreEqual ("@p7", param.ParameterName, prefix + "ParameterName (7)"); + Assert.AreEqual (0, param.Precision, prefix + "Precision (7)"); + Assert.AreEqual (0, param.Scale, prefix + "Scale (7)"); + Assert.AreEqual (0, param.Size, prefix + "Size (7)"); + Assert.AreEqual ("lname", param.SourceColumn, prefix + "SourceColumn (7)"); + Assert.IsFalse (param.SourceColumnNullMapping, prefix + "SourceColumnNullMapping (7)"); + Assert.AreEqual (DataRowVersion.Original, param.SourceVersion, prefix + "SourceVersion (7)"); + Assert.AreEqual (SqlDbType.VarChar, param.SqlDbType, prefix + "SqlDbType (7)"); + Assert.IsNull (param.SqlValue, prefix + "SqlValue (7)"); + //Assert.AreEqual (string.Empty, param.UdtTypeName, prefix + "UdtTypeName (7)"); + Assert.IsNull (param.Value, prefix + "Value (7)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionDatabase, prefix + "XmlSchemaCollectionDatabase (7)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (7)"); + Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (7)"); + } + + static int ClientVersion { + get { + return (SqlCommandBuilderTest.Engine.ClientVersion); + } + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandTest.cs new file mode 100644 index 0000000000..7e6478299c --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandTest.cs @@ -0,0 +1,2886 @@ +// +// SqlCommandTest.cs - NUnit Test Cases for testing the +// SqlCommand class +// Author: +// Umadevi S (sumadevi@novell.com) +// Sureshkumar T (tsureshkumar@novell.com) +// Senganal T (tsenganal@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.Sql; +using System.Globalization; +using System.Xml; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlCommandTest + { + SqlConnection conn; + SqlCommand cmd; + string connectionString = ConnectionManager.Instance.Sql.ConnectionString; + EngineConfig engine; + + static readonly decimal SMALLMONEY_MAX = 214748.3647m; + static readonly decimal SMALLMONEY_MIN = -214748.3648m; + + [SetUp] + public void SetUp () + { + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [TearDown] + public void TearDown () + { + if (cmd != null) { + cmd.Dispose (); + cmd = null; + } + + if (conn != null) { + conn.Close (); + conn = null; + } + } + + [Test] // ctor (String, SqlConnection, SqlTransaction) + public void Constructor4 () + { + string cmdText = "select @@version"; + + SqlTransaction trans = null; + SqlConnection connA = null; + SqlConnection connB = null; + + // transaction from same connection + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + trans = connA.BeginTransaction (); + cmd = new SqlCommand (cmdText, connA, trans); + + Assert.AreEqual (cmdText, cmd.CommandText, "#A1"); + Assert.AreEqual (30, cmd.CommandTimeout, "#A2"); + Assert.AreEqual (CommandType.Text, cmd.CommandType, "#A3"); + Assert.AreSame (connA, cmd.Connection, "#A4"); + Assert.IsNull (cmd.Container, "#A5"); + Assert.IsTrue (cmd.DesignTimeVisible, "#A6"); + Assert.IsNull (cmd.Notification, "#A7"); + Assert.IsTrue (cmd.NotificationAutoEnlist, "#A8"); + Assert.IsNotNull (cmd.Parameters, "#A9"); + Assert.AreEqual (0, cmd.Parameters.Count, "#A10"); + Assert.IsNull (cmd.Site, "#A11"); + Assert.AreSame (trans, cmd.Transaction, "#A12"); + Assert.AreEqual (UpdateRowSource.Both, cmd.UpdatedRowSource, "#A13"); + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + } + + // transaction from other connection + try { + connA = new SqlConnection (connectionString); + connA.Open (); + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connB.BeginTransaction (); + cmd = new SqlCommand (cmdText, connA, trans); + + Assert.AreEqual (cmdText, cmd.CommandText, "#B1"); + Assert.AreEqual (30, cmd.CommandTimeout, "#B2"); + Assert.AreEqual (CommandType.Text, cmd.CommandType, "#B3"); + Assert.AreSame (connA, cmd.Connection, "#B4"); + Assert.IsNull (cmd.Container, "#B5"); + Assert.IsTrue (cmd.DesignTimeVisible, "#B6"); + Assert.IsNull (cmd.Notification, "#B7"); + Assert.IsTrue (cmd.NotificationAutoEnlist, "#B8"); + Assert.IsNotNull (cmd.Parameters, "#B9"); + Assert.AreEqual (0, cmd.Parameters.Count, "#B10"); + Assert.IsNull (cmd.Site, "#B11"); + Assert.AreSame (trans, cmd.Transaction, "#B12"); + Assert.AreEqual (UpdateRowSource.Both, cmd.UpdatedRowSource, "#B13"); + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + } + } + + [Test] // bug #341743 + public void Dispose_Connection_Disposed () + { + conn = ConnectionManager.Instance.Sql.Connection; + + cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT 'a'"; + cmd.ExecuteNonQuery (); + + conn.Dispose (); + + Assert.AreSame (conn, cmd.Connection, "#1"); + cmd.Dispose (); + Assert.AreSame (conn, cmd.Connection, "#2"); + } + + [Test] + [Category("NotWorking")] + public void ExecuteScalar () + { + conn = new SqlConnection (connectionString); + cmd = new SqlCommand ("", conn); + cmd.CommandText = "Select count(*) from numeric_family where id<=4"; + + // Check the Return value for a Correct Query + object result = 0; + conn.Open (); + result = cmd.ExecuteScalar (); + Assert.AreEqual (4, (int) result, "#A1 Query Result returned is incorrect"); + + cmd.CommandText = "select id , type_bit from numeric_family order by id asc"; + result = Convert.ToInt32 (cmd.ExecuteScalar ()); + Assert.AreEqual (1, result, + "#A2 ExecuteScalar Should return (1,1) the result set"); + + cmd.CommandText = "select id from numeric_family where id=-1"; + result = cmd.ExecuteScalar (); + Assert.IsNull (result, "#A3 Null should be returned if result set is empty"); + + // Check SqlException is thrown for Invalid Query + cmd.CommandText = "select count* from numeric_family"; + try { + result = cmd.ExecuteScalar (); + Assert.Fail ("#B1"); + } catch (SqlException ex) { + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#B2"); + Assert.AreEqual ((byte) 15, ex.Class, "#B3"); + Assert.IsNull (ex.InnerException, "#B4"); + Assert.IsNotNull (ex.Message, "#B5"); + if (ClientVersion == 7) { + // Incorrect syntax near '*' + Assert.IsTrue (ex.Message.IndexOf ("'*'") != -1, "#B6: " + ex.Message); + Assert.AreEqual (170, ex.Number, "#B7"); + } else { + // Incorrect syntax near the keyword 'from' + Assert.IsTrue (ex.Message.IndexOf ("'from'") != -1, "#B6: " + ex.Message); + Assert.AreEqual (156, ex.Number, "#B7"); + } + Assert.AreEqual ((byte) 1, ex.State, "#B8"); + } + + // Parameterized stored procedure calls + + int int_value = 20; + string string_value = "output value changed"; + string return_value = "first column of first rowset"; + + cmd.CommandText = + "create procedure #tmp_executescalar_outparams " + + " (@p1 int, @p2 int out, @p3 varchar(200) out) " + + "as " + + "select '" + return_value + "' as 'col1', @p1 as 'col2' " + + "set @p2 = @p2 * 2 " + + "set @p3 = N'" + string_value + "' " + + "select 'second rowset' as 'col1', 2 as 'col2' " + + "return 1"; + + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#tmp_executescalar_outparams"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.Input; + p1.DbType = DbType.Int32; + p1.Value = int_value; + cmd.Parameters.Add (p1); + + SqlParameter p2 = new SqlParameter (); + p2.ParameterName = "@p2"; + p2.Direction = ParameterDirection.InputOutput; + p2.DbType = DbType.Int32; + p2.Value = int_value; + cmd.Parameters.Add (p2); + + SqlParameter p3 = new SqlParameter (); + p3.ParameterName = "@p3"; + p3.Direction = ParameterDirection.Output; + p3.DbType = DbType.String; + p3.Size = 200; + cmd.Parameters.Add (p3); + + result = cmd.ExecuteScalar (); + Assert.AreEqual (return_value, result, "#C1 ExecuteScalar Should return 'first column of first rowset'"); + Assert.AreEqual (int_value * 2, p2.Value, "#C2 ExecuteScalar should fill the parameter collection with the outputted values"); + Assert.AreEqual (string_value, p3.Value, "#C3 ExecuteScalar should fill the parameter collection with the outputted values"); + + p3.Size = 0; + p3.Value = null; + try { + cmd.ExecuteScalar (); + Assert.Fail ("#D1 Query should throw System.InvalidOperationException due to size = 0 and value = null"); + } catch (InvalidOperationException ex) { + // String[2]: the Size property has an invalid + // size of 0 + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#D2"); + Assert.IsNull (ex.InnerException, "#D3"); + Assert.IsNotNull (ex.Message, "#D4"); + } finally { + conn.Close (); + } + } + + [Test] + public void ExecuteScalar_CommandText_Empty () + { + conn = ConnectionManager.Instance.Sql.Connection; + + cmd = conn.CreateCommand (); + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // ExecuteScalar: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteScalar"), "#A5:" + ex.Message); + } + + cmd.CommandText = string.Empty; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // ExecuteScalar: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteScalar"), "#B5:" + ex.Message); + } + + cmd.CommandText = null; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#C1"); + } catch (InvalidOperationException ex) { + // ExecuteScalar: CommandText property + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2"); + Assert.IsNull (ex.InnerException, "#C3"); + Assert.IsNotNull (ex.Message, "#C4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteScalar"), "#C5:" + ex.Message); + } + } + + [Test] + public void ExecuteScalar_Connection_PendingTransaction () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (SqlTransaction trans = conn.BeginTransaction ()) { + cmd = new SqlCommand ("select @@version", conn); + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteScalar requires the command + // to have a transaction object when the + // connection assigned to the command is + // in a pending local transaction. The + // Transaction property of the command + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf ("ExecuteScalar") != -1, "#5:" + ex.Message); + } + } + } + + [Test] + public void ExecuteScalar_Query_Invalid () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("InvalidQuery", conn); + try { + cmd.ExecuteScalar (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Could not find stored procedure 'InvalidQuery' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.IsTrue (ex.Message.IndexOf ("'InvalidQuery'") != -1, "#6:" + ex.Message); + Assert.AreEqual (2812, ex.Number, "#7"); + Assert.AreEqual ((byte) 62, ex.State, "#8"); + } + } + + [Test] + public void ExecuteScalar_Transaction_NotAssociated () + { + SqlTransaction trans = null; + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connA.BeginTransaction (); + + cmd = new SqlCommand ("select @@version", connB, trans); + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } finally { + cmd.Dispose (); + } + + cmd = new SqlCommand ("select @@version", connB); + cmd.Transaction = trans; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } finally { + cmd.Dispose (); + } + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void ExecuteScalar_Transaction_Only () + { + SqlTransaction trans = null; + + conn = new SqlConnection (connectionString); + conn.Open (); + trans = conn.BeginTransaction (); + + cmd = new SqlCommand ("select @@version"); + cmd.Transaction = trans; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteScalar: Connection property has not + // been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteScalar:"), "#5"); + } finally { + trans.Dispose (); + } + } + + [Test] + [Category("NotWorking")] + public void ExecuteNonQuery () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + SqlTransaction trans = conn.BeginTransaction (); + + cmd = conn.CreateCommand (); + cmd.Transaction = trans; + + int result = 0; + + try { + cmd.CommandText = "Select id from numeric_family where id=1"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (-1, result, "#A1"); + + cmd.CommandText = "Insert into numeric_family (id,type_int) values (100,200)"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#A2 One row shud be inserted"); + + cmd.CommandText = "Update numeric_family set type_int=300 where id=100"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#A3 One row shud be updated"); + + // Test Batch Commands + cmd.CommandText = "Select id from numeric_family where id=1;"; + cmd.CommandText += "update numeric_family set type_int=10 where id=1000"; + cmd.CommandText += "update numeric_family set type_int=10 where id=100"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#A4 One row shud be updated"); + + cmd.CommandText = "Delete from numeric_family where id=100"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#A5 One row shud be deleted"); + } finally { + trans.Dispose (); + } + + // Parameterized stored procedure calls + + int int_value = 20; + string string_value = "output value changed"; + + cmd.CommandText = + "create procedure #tmp_executescalar_outparams " + + " (@p1 int, @p2 int out, @p3 varchar(200) out) " + + "as " + + "select 'test' as 'col1', @p1 as 'col2' " + + "set @p2 = @p2 * 2 " + + "set @p3 = N'" + string_value + "' " + + "select 'second rowset' as 'col1', 2 as 'col2' " + + "return 1"; + + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#tmp_executescalar_outparams"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.Input; + p1.DbType = DbType.Int32; + p1.Value = int_value; + cmd.Parameters.Add (p1); + + SqlParameter p2 = new SqlParameter ("@p2", int_value); + p2.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add (p2); + + SqlParameter p3 = new SqlParameter (); + p3.ParameterName = "@p3"; + p3.Direction = ParameterDirection.Output; + p3.DbType = DbType.String; + p3.Size = 200; + cmd.Parameters.Add (p3); + + cmd.ExecuteNonQuery (); + Assert.AreEqual (int_value * 2, p2.Value, "#B1"); + Assert.AreEqual (string_value, p3.Value, "#B2"); + } + + [Test] + public void ExecuteNonQuery_Connection_PendingTransaction () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (SqlTransaction trans = conn.BeginTransaction ()) { + cmd = new SqlCommand ("select @@version", conn); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteNonQuery requires the command + // to have a transaction object when the + // connection assigned to the command is + // in a pending local transaction. The + // Transaction property of the command + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf ("ExecuteNonQuery") != -1, "#5:" + ex.Message); + } + } + } + + [Test] + public void ExecuteNonQuery_Query_Invalid () + { + conn = new SqlConnection (connectionString); + conn.Open (); + cmd = new SqlCommand ("select id1 from numeric_family", conn); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#A1"); + } catch (SqlException ex) { + // Invalid column name 'id1' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#A2"); + Assert.AreEqual ((byte) 16, ex.Class, "#A3"); + Assert.IsNull (ex.InnerException, "#A4"); + Assert.IsNotNull (ex.Message, "#A5"); + Assert.IsTrue (ex.Message.IndexOf ("'id1'") != -1, "#A6:" + ex.Message); + Assert.AreEqual (207, ex.Number, "#A7"); + if (ClientVersion == 7) + Assert.AreEqual ((byte) 3, ex.State, "#A8"); + else + Assert.AreEqual ((byte) 1, ex.State, "#A8"); + } + + // ensure connection is not closed after error + + int result; + + cmd.CommandText = "INSERT INTO numeric_family (id, type_int) VALUES (6100, 200)"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#B1"); + + cmd.CommandText = "DELETE FROM numeric_family WHERE id = 6100"; + result = cmd.ExecuteNonQuery (); + Assert.AreEqual (1, result, "#B1"); + } + + [Test] + public void ExecuteNonQuery_Transaction_NotAssociated () + { + SqlTransaction trans = null; + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connA.BeginTransaction (); + + cmd = new SqlCommand ("select @@version", connB, trans); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } finally { + cmd.Dispose (); + } + + cmd = new SqlCommand ("select @@version", connB); + cmd.Transaction = trans; + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } finally { + cmd.Dispose (); + } + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void ExecuteNonQuery_Transaction_Only () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + SqlTransaction trans = conn.BeginTransaction (); + + cmd = new SqlCommand ("select @@version"); + cmd.Transaction = trans; + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteNonQuery: Connection property has not + // been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteNonQuery:"), "#5"); + } finally { + trans.Dispose (); + } + } + + [Test] // bug #412569 + public void ExecuteReader () + { + // Test for command behaviors + DataTable schemaTable = null; + SqlDataReader reader = null; + + conn = new SqlConnection (connectionString); + conn.Open (); + cmd = new SqlCommand ("", conn); + cmd.CommandText = "Select id from numeric_family where id <=4 order by id asc;"; + cmd.CommandText += "Select type_bit from numeric_family where id <=4 order by id asc"; + + // Test for default command behavior + reader = cmd.ExecuteReader (); + int rows = 0; + int results = 0; + do { + while (reader.Read ()) + rows++; + Assert.AreEqual (4, rows, "#1 Multiple rows shud be returned"); + results++; + rows = 0; + } while (reader.NextResult ()); + Assert.AreEqual (2, results, "#2 Multiple result sets shud be returned"); + reader.Close (); + + // Test if closing reader, closes the connection + reader = cmd.ExecuteReader (CommandBehavior.CloseConnection); + reader.Close (); + Assert.AreEqual (ConnectionState.Closed, conn.State, + "#3 Command Behavior is not followed"); + conn.Open (); + + // Test if row info and primary Key info is returned + reader = cmd.ExecuteReader (CommandBehavior.KeyInfo); + schemaTable = reader.GetSchemaTable (); + Assert.IsTrue (reader.HasRows, "#4 Data Rows shud also be returned"); + Assert.IsTrue ((bool) schemaTable.Rows [0] ["IsKey"], + "#5 Primary Key info shud be returned"); + reader.Close (); + + // Test only column information is returned + reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + schemaTable = reader.GetSchemaTable (); + Assert.IsFalse (reader.HasRows, "#6 row data shud not be returned"); + Assert.AreEqual (DBNull.Value, schemaTable.Rows [0] ["IsKey"], + "#7 Primary Key info shud not be returned"); + Assert.AreEqual ("id", schemaTable.Rows [0] ["ColumnName"], + "#8 Schema Data is Incorrect"); + reader.Close (); + + // Test only one result set (first) is returned + reader = cmd.ExecuteReader (CommandBehavior.SingleResult); + schemaTable = reader.GetSchemaTable (); + Assert.IsFalse (reader.NextResult (), + "#9 Only one result set shud be returned"); + Assert.AreEqual ("id", schemaTable.Rows [0] ["ColumnName"], + "#10 The result set returned shud be the first result set"); + reader.Close (); + + // Test only one row is returned for all result sets + // msdotnet doesnt work correctly.. returns only one result set + reader = cmd.ExecuteReader (CommandBehavior.SingleRow); + rows = 0; + results = 0; + do { + while (reader.Read ()) + rows++; + Assert.AreEqual (1, rows, "#11 Only one row shud be returned"); + results++; + rows = 0; + } while (reader.NextResult ()); + + // LAMESPEC: + // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=357085 + Assert.AreEqual (1, results, "#12 Multiple result sets shud be returned"); + reader.Close (); + } + + [Test] + public void ExecuteReader_Connection_PendingTransaction () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (SqlTransaction trans = conn.BeginTransaction ()) { + cmd = new SqlCommand ("select @@version", conn); + + try { + cmd.ExecuteReader (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteReader requires the command + // to have a transaction object when the + // connection assigned to the command is + // in a pending local transaction. The + // Transaction property of the command + // has not been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf ("ExecuteReader") != -1, "#5:" + ex.Message); + } + } + } + + [Test] + public void ExecuteReader_Query_Invalid () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("InvalidQuery", conn); + try { + cmd.ExecuteReader (); + Assert.Fail ("#A1"); + } catch (SqlException ex) { + // Could not find stored procedure 'InvalidQuery' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#A2"); + Assert.AreEqual ((byte) 16, ex.Class, "#A3"); + Assert.IsNull (ex.InnerException, "#A4"); + Assert.IsNotNull (ex.Message, "#A5"); + Assert.IsTrue (ex.Message.IndexOf ("'InvalidQuery'") != -1, "#A6:" + ex.Message); + Assert.AreEqual (2812, ex.Number, "#A7"); + Assert.AreEqual ((byte) 62, ex.State, "#A8"); + + // connection is not closed + Assert.AreEqual (ConnectionState.Open, conn.State, "#A9"); + } + + try { + cmd.ExecuteReader (CommandBehavior.CloseConnection); + Assert.Fail ("#B1"); + } catch (SqlException ex) { + // Could not find stored procedure 'InvalidQuery' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#B2"); + Assert.AreEqual ((byte) 16, ex.Class, "#B3"); + Assert.IsNull (ex.InnerException, "#B4"); + Assert.IsNotNull (ex.Message, "#B5"); + Assert.IsTrue (ex.Message.IndexOf ("'InvalidQuery'") != -1, "#B6:" + ex.Message); + Assert.AreEqual (2812, ex.Number, "#B7"); + Assert.AreEqual ((byte) 62, ex.State, "#B8"); + + // connection is closed + Assert.AreEqual (ConnectionState.Closed, conn.State, "#B9"); + } + } + + [Test] + public void ExecuteReader_Transaction_NotAssociated () + { + SqlTransaction trans = null; + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connA.BeginTransaction (); + + cmd = new SqlCommand ("select @@version", connB, trans); + + try { + cmd.ExecuteReader (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } finally { + cmd.Dispose (); + } + + cmd = new SqlCommand ("select @@version", connB); + cmd.Transaction = trans; + + try { + cmd.ExecuteReader (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // The transaction object is not associated + // with the connection object + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } finally { + cmd.Dispose (); + } + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void ExecuteReader_Transaction_Only () + { + SqlTransaction trans = null; + + conn = new SqlConnection (connectionString); + conn.Open (); + trans = conn.BeginTransaction (); + + cmd = new SqlCommand ("select @@version"); + cmd.Transaction = trans; + + try { + cmd.ExecuteReader (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // ExecuteReader: Connection property has not + // been initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.StartsWith ("ExecuteReader:"), "#5"); + } finally { + trans.Dispose (); + } + } + + + [Test] + public void PrepareTest_CheckValidStatement () + { + cmd = new SqlCommand (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd.CommandText = "Select id from numeric_family where id=@ID"; + cmd.Connection = conn; + + // Test if Parameters are correctly populated + cmd.Parameters.Clear (); + cmd.Parameters.Add ("@ID", SqlDbType.TinyInt); + cmd.Parameters ["@ID"].Value = 2; + cmd.Prepare (); + Assert.AreEqual (2, cmd.ExecuteScalar (), "#3 Prepared Stmt not working"); + + cmd.Parameters [0].Value = 3; + Assert.AreEqual (3, cmd.ExecuteScalar (), "#4 Prep Stmt not working"); + conn.Close (); + } + + [Test] + public void Prepare () + { + cmd = new SqlCommand (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd.CommandText = "Select id from numeric_family where id=@ID"; + cmd.Connection = conn; + + // Test InvalidOperation Exception is thrown if Parameter Type + // is not explicitly set + cmd.Parameters.AddWithValue ("@ID", 2); + try { + cmd.Prepare (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // SqlCommand.Prepare method requires all parameters + // to have an explicitly set type + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + // Test Exception is thrown for variable size data if precision/scale + // is not set + cmd.CommandText = "select type_varchar from string_family where type_varchar=@p1"; + cmd.Parameters.Clear (); + cmd.Parameters.Add ("@p1", SqlDbType.VarChar); + cmd.Parameters ["@p1"].Value = "afasasadadada"; + try { + cmd.Prepare (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // SqlCommand.Prepare method requires all variable + // length parameters to have an explicitly set + // non-zero Size + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + + // Test Exception is not thrown if DbType is set - #569543 + try { + cmd.CommandText = "select type_guid from string_family where type_guid=@p1"; + cmd.Parameters.Clear (); + cmd.Parameters.Add ("@p1", SqlDbType.UniqueIdentifier); + cmd.Parameters ["@p1"].Value = new Guid ("1C47DD1D-891B-47E8-AAC8-F36608B31BC5"); + cmd.Prepare (); + } catch (Exception ex) { + Assert.Fail ("#B5 "+ex.Message); + } + + // Test Exception is not thrown for Stored Procs + cmd.CommandType = CommandType.StoredProcedure; + cmd.CommandText = "ABFSDSFSF"; + cmd.Prepare (); + + cmd.CommandType = CommandType.Text; + conn.Close (); + } + + [Test] + public void Prepare_Connection_PendingTransaction () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (SqlTransaction trans = conn.BeginTransaction ()) { + // Text, without parameters + cmd = new SqlCommand ("select * from whatever where name=?", conn); + cmd.Prepare (); + + // Text, with parameters + cmd = new SqlCommand ("select * from whatever where name=?", conn); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + try { + cmd.Prepare (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // Prepare requires the command to have a + // transaction object when the connection + // assigned to the command is in a pending + // local transaction. The Transaction + // property of the command has not been + // initialized + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf ("Prepare") != -1, "#5:" + ex.Message); + } + + // Text, parameters cleared + cmd = new SqlCommand ("select * from whatever where name=?", conn); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Parameters.Clear (); + cmd.Prepare (); + + // StoredProcedure, without parameters + cmd = new SqlCommand ("FindCustomer", conn); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Prepare (); + + // StoredProcedure, with parameters + cmd = new SqlCommand ("FindCustomer", conn); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Prepare (); + } + } + + [Test] + public void Prepare_Transaction_NotAssociated () + { + SqlTransaction trans = null; + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connA.BeginTransaction (); + + // Text, without parameters + cmd = new SqlCommand ("select @@version", connB, trans); + cmd.Transaction = trans; + cmd.Prepare (); + + // Text, with parameters + cmd = new SqlCommand ("select @@version", connB, trans); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + try { + cmd.Prepare (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // The transaction is either not associated + // with the current connection or has been + // completed + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + + // Text, parameters cleared + cmd = new SqlCommand ("select @@version", connB, trans); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Parameters.Clear (); + cmd.Prepare (); + + // StoredProcedure, without parameters + cmd = new SqlCommand ("FindCustomer", connB, trans); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Prepare (); + + // StoredProcedure, with parameters + cmd = new SqlCommand ("FindCustomer", connB, trans); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Prepare (); + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + [Category("NotWorking")] + public void Prepare_Transaction_Only () + { + SqlTransaction trans = null; + + conn = new SqlConnection (connectionString); + conn.Open (); + trans = conn.BeginTransaction (); + + // Text, without parameters + cmd = new SqlCommand ("select count(*) from whatever"); + cmd.Transaction = trans; + cmd.Prepare(); + + // Text, with parameters + cmd = new SqlCommand ("select count(*) from whatever"); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Transaction = trans; + Assert.Throws(() => cmd.Prepare()); + + // Text, parameters cleared + cmd = new SqlCommand ("select count(*) from whatever"); + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Parameters.Clear (); + cmd.Transaction = trans; + cmd.Prepare(); + + // StoredProcedure, without parameters + cmd = new SqlCommand ("FindCustomer"); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Transaction = trans; + cmd.Prepare(); + + // StoredProcedure, with parameters + cmd = new SqlCommand ("FindCustomer"); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.Add ("@TestPar1", SqlDbType.Int); + cmd.Transaction = trans; + cmd.Prepare(); + } + + [Test] // bug #412576 + public void Connection () + { + SqlConnection connA = null; + SqlConnection connB = null; + SqlTransaction trans = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + cmd = connA.CreateCommand (); + cmd.Connection = connB; + Assert.AreSame (connB, cmd.Connection, "#A1"); + Assert.IsNull (cmd.Transaction, "#A2"); + cmd.Dispose (); + + trans = connA.BeginTransaction (); + cmd = new SqlCommand ("select @@version", connA, trans); + cmd.Connection = connB; + Assert.AreSame (connB, cmd.Connection, "#B1"); + Assert.AreSame (trans, cmd.Transaction, "#B2"); + trans.Dispose (); + + trans = connA.BeginTransaction (); + cmd = new SqlCommand ("select @@version", connA, trans); + trans.Rollback (); + Assert.AreSame (connA, cmd.Connection, "#C1"); + Assert.IsNull (cmd.Transaction, "#C2"); + cmd.Connection = connB; + Assert.AreSame (connB, cmd.Connection, "#C3"); + Assert.IsNull (cmd.Transaction, "#C4"); + + trans = connA.BeginTransaction (); + cmd = new SqlCommand ("select @@version", connA, trans); + cmd.Connection = null; + Assert.IsNull (cmd.Connection, "#D1"); + Assert.AreSame (trans, cmd.Transaction, "#D2"); + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void Connection_Reader_Open () + { + SqlConnection connA = null; + SqlConnection connB = null; + SqlTransaction trans = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + trans = connA.BeginTransaction (); + SqlCommand cmdA = new SqlCommand ("select @@version", connA, trans); + + SqlCommand cmdB = new SqlCommand ("select @@version", connA, trans); + using (SqlDataReader reader = cmdB.ExecuteReader ()) { + cmdA.Connection = connA; + Assert.AreSame (connA, cmdA.Connection, "#A1"); + Assert.AreSame (trans, cmdA.Transaction, "#A2"); + + cmdA.Connection = connB; + Assert.AreSame (connB, cmdA.Connection, "#B1"); + Assert.AreSame (trans, cmdA.Transaction, "#B2"); + + cmdA.Connection = null; + Assert.IsNull (cmdA.Connection, "#C1"); + Assert.AreSame (trans, cmdA.Transaction, "#C2"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void Transaction () + { + SqlConnection connA = null; + SqlConnection connB = null; + + SqlTransaction transA = null; + SqlTransaction transB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + transA = connA.BeginTransaction (); + transB = connB.BeginTransaction (); + + SqlCommand cmd = new SqlCommand ("select @@version", connA, transA); + cmd.Transaction = transA; + Assert.AreSame (connA, cmd.Connection, "#A1"); + Assert.AreSame (transA, cmd.Transaction, "#A2"); + cmd.Transaction = transB; + Assert.AreSame (connA, cmd.Connection, "#B1"); + Assert.AreSame (transB, cmd.Transaction, "#B2"); + cmd.Transaction = null; + Assert.AreSame (connA, cmd.Connection, "#C1"); + Assert.IsNull (cmd.Transaction, "#C2"); + } finally { + if (transA != null) + transA.Dispose (); + if (transB != null) + transA.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] // bug #412579 + public void Transaction_Reader_Open () + { + SqlConnection connA = null; + SqlConnection connB = null; + + SqlTransaction transA = null; + SqlTransaction transB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + transA = connA.BeginTransaction (); + transB = connB.BeginTransaction (); + + SqlCommand cmdA = new SqlCommand ("select * from employee", connA, transA); + + SqlCommand cmdB = new SqlCommand ("select * from employee", connA, transA); + using (SqlDataReader reader = cmdB.ExecuteReader ()) { + cmdA.Transaction = transA; + Assert.AreSame (transA, cmdA.Transaction, "#A1"); + + cmdA.Transaction = transB; + Assert.AreSame (transB, cmdA.Transaction, "#B1"); + + cmdA.Transaction = null; + Assert.IsNull (cmdA.Transaction, "#C1"); + } + + cmdA.Transaction = transA; + Assert.AreSame (transA, cmdA.Transaction, "#D1"); + cmdA.Transaction = transB; + Assert.AreSame (transB, cmdA.Transaction, "#D2"); + } finally { + if (transA != null) + transA.Dispose (); + if (transB != null) + transA.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + } + } + + [Test] + public void ExecuteNonQuery_StoredProcedure () + { + SqlParameter param; + SqlCommand cmd = null; + SqlDataReader dr = null; + SqlParameter idParam; + SqlParameter dojParam; + + conn = ConnectionManager.Instance.Sql.Connection; + + // parameters with leading '@' + try { + // create temp sp here, should normally be created in Setup of test + // case, but cannot be done right now because of bug #68978 + DBHelper.ExecuteNonQuery (conn, CREATE_TMP_SP_TEMP_INSERT_PERSON); + + cmd = conn.CreateCommand (); + cmd.CommandText = "#sp_temp_insert_employee"; + cmd.CommandType = CommandType.StoredProcedure; + param = cmd.Parameters.Add ("@fname", SqlDbType.VarChar); + param.Value = "testA"; + dojParam = cmd.Parameters.Add ("@doj", SqlDbType.DateTime); + dojParam.Direction = ParameterDirection.Output; + param = cmd.Parameters.Add ("@dob", SqlDbType.DateTime); + param.Value = new DateTime (2004, 8, 20); + idParam = cmd.Parameters.Add ("@id", SqlDbType.Int); + idParam.Direction = ParameterDirection.ReturnValue; + + Assert.AreEqual (1, cmd.ExecuteNonQuery (), "#A1"); + cmd.Dispose (); + + cmd = conn.CreateCommand (); + cmd.CommandText = "select fname, dob, doj from employee where id = @id"; + param = cmd.Parameters.Add ("@id", SqlDbType.Int); + param.Value = idParam.Value; + + dr = cmd.ExecuteReader (); + Assert.IsTrue (dr.Read (), "#A2"); + Assert.AreEqual (typeof (string), dr.GetFieldType (0), "#A3"); + Assert.AreEqual ("testA", dr.GetValue (0), "#A4"); + Assert.AreEqual (typeof (DateTime), dr.GetFieldType (1), "#A5"); + Assert.AreEqual (new DateTime (2004, 8, 20), dr.GetValue (1), "#A6"); + Assert.AreEqual (typeof (DateTime), dr.GetFieldType (2), "#A7"); + Assert.AreEqual (dojParam.Value, dr.GetValue (2), "#A8"); + Assert.IsFalse (dr.Read (), "#A9"); + cmd.Dispose (); + dr.Close (); + } finally { + if (cmd != null) + cmd.Dispose (); + if (dr != null) + dr.Close (); + DBHelper.ExecuteNonQuery (conn, DROP_TMP_SP_TEMP_INSERT_PERSON); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + conn.Close (); + } + + conn.Open (); + + // parameters without leading '@' + try { + // create temp sp here, should normally be created in Setup of test + // case, but cannot be done right now because of bug #68978 + DBHelper.ExecuteNonQuery (conn, CREATE_TMP_SP_TEMP_INSERT_PERSON); + + cmd = conn.CreateCommand (); + cmd.CommandText = "#sp_temp_insert_employee"; + cmd.CommandType = CommandType.StoredProcedure; + param = cmd.Parameters.Add ("fname", SqlDbType.VarChar); + param.Value = "testB"; + dojParam = cmd.Parameters.Add ("doj", SqlDbType.DateTime); + dojParam.Direction = ParameterDirection.Output; + param = cmd.Parameters.Add ("dob", SqlDbType.DateTime); + param.Value = new DateTime (2004, 8, 20); + idParam = cmd.Parameters.Add ("id", SqlDbType.Int); + idParam.Direction = ParameterDirection.ReturnValue; + + Assert.AreEqual (1, cmd.ExecuteNonQuery (), "#B1"); + cmd.Dispose (); + + cmd = conn.CreateCommand (); + cmd.CommandText = "select fname, dob, doj from employee where id = @id"; + param = cmd.Parameters.Add ("id", SqlDbType.Int); + param.Value = idParam.Value; + + dr = cmd.ExecuteReader (); + Assert.IsTrue (dr.Read (), "#B2"); + Assert.AreEqual (typeof (string), dr.GetFieldType (0), "#B3"); + Assert.AreEqual ("testB", dr.GetValue (0), "#B4"); + Assert.AreEqual (typeof (DateTime), dr.GetFieldType (1), "#B5"); + Assert.AreEqual (new DateTime (2004, 8, 20), dr.GetValue (1), "#B6"); + Assert.AreEqual (typeof (DateTime), dr.GetFieldType (2), "#B7"); + Assert.AreEqual (dojParam.Value, dr.GetValue (2), "#B8"); + Assert.IsFalse (dr.Read (), "#B9"); + cmd.Dispose (); + dr.Close (); + } finally { + if (cmd != null) + cmd.Dispose (); + if (dr != null) + dr.Close (); + DBHelper.ExecuteNonQuery (conn, DROP_TMP_SP_TEMP_INSERT_PERSON); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + conn.Close (); + } + } + + [Test] // bug #319598 + public void LongQueryTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Hangs on SQL Server 7.0"); + + SqlConnection conn = new SqlConnection ( + connectionString + ";Pooling=false"); + using (conn) { + conn.Open (); + SqlCommand cmd = conn.CreateCommand (); + String value = new String ('a', 10000); + cmd.CommandText = String.Format ("Select '{0}'", value); + cmd.ExecuteNonQuery (); + } + } + + [Test] // bug #319598 + [Category("NotWorking")] + public void LongStoredProcTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Hangs on SQL Server 7.0"); + + SqlConnection conn = new SqlConnection ( + connectionString + ";Pooling=false"); + using (conn) { + conn.Open (); + /*int size = conn.PacketSize;*/ + SqlCommand cmd = conn.CreateCommand (); + // create a temp stored proc + cmd.CommandText = "Create Procedure #sp_tmp_long_params "; + cmd.CommandText += "@p1 nvarchar (4000), "; + cmd.CommandText += "@p2 nvarchar (4000), "; + cmd.CommandText += "@p3 nvarchar (4000), "; + cmd.CommandText += "@p4 nvarchar (4000) out "; + cmd.CommandText += "As "; + cmd.CommandText += "Begin "; + cmd.CommandText += "Set @p4 = N'Hello' "; + cmd.CommandText += "Return 2 "; + cmd.CommandText += "End"; + cmd.ExecuteNonQuery (); + + //execute the proc + cmd.CommandType = CommandType.StoredProcedure; + cmd.CommandText = "#sp_tmp_long_params"; + + String value = new String ('a', 4000); + SqlParameter p1 = new SqlParameter ("@p1", + SqlDbType.NVarChar, 4000); + p1.Value = value; + + SqlParameter p2 = new SqlParameter ("@p2", + SqlDbType.NVarChar, 4000); + p2.Value = value; + + SqlParameter p3 = new SqlParameter ("@p3", + SqlDbType.NVarChar, 4000); + p3.Value = value; + + SqlParameter p4 = new SqlParameter ("@p4", + SqlDbType.NVarChar, 4000); + p4.Direction = ParameterDirection.Output; + + // for now, name shud be @RETURN_VALUE + // can be changed once RPC is implemented + SqlParameter p5 = new SqlParameter ("@RETURN_VALUE", SqlDbType.Int); + p5.Direction = ParameterDirection.ReturnValue; + + cmd.Parameters.Add (p1); + cmd.Parameters.Add (p2); + cmd.Parameters.Add (p3); + cmd.Parameters.Add (p4); + cmd.Parameters.Add (p5); + + cmd.ExecuteNonQuery (); + Assert.AreEqual ("Hello", p4.Value, "#1"); + Assert.AreEqual (2, p5.Value, "#2"); + } + } + + [Test] // bug #319694 + public void DateTimeParameterTest () + { + SqlConnection conn = new SqlConnection (connectionString); + using (conn) { + conn.Open (); + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = "select * from datetime_family where type_datetime=@p1"; + cmd.Parameters.Add ("@p1", SqlDbType.DateTime).Value = "10-10-2005"; + // shudnt cause and exception + SqlDataReader rdr = cmd.ExecuteReader (); + rdr.Close (); + } + } + + /** + * Verifies whether an enum value is converted to a numeric value when + * used as value for a numeric parameter (bug #66630) + */ + [Test] + public void EnumParameterTest () + { + conn = ConnectionManager.Instance.Sql.Connection; + try { + // create temp sp here, should normally be created in Setup of test + // case, but cannot be done right now because of ug #68978 + DBHelper.ExecuteNonQuery (conn, "CREATE PROCEDURE #Bug66630 (" + + "@Status smallint = 7" + + ")" + + "AS" + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "SELECT CAST(5 AS int), @Status" + Environment.NewLine + + "END"); + + SqlCommand cmd = new SqlCommand ("#Bug66630", conn); + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.Add ("@Status", SqlDbType.Int).Value = Status.Error; + + using (SqlDataReader dr = cmd.ExecuteReader ()) { + // one record should be returned + Assert.IsTrue (dr.Read (), "EnumParameterTest#1"); + // we should get two field in the result + Assert.AreEqual (2, dr.FieldCount, "EnumParameterTest#2"); + // field 1 + Assert.AreEqual ("int", dr.GetDataTypeName (0), "EnumParameterTest#3"); + Assert.AreEqual (5, dr.GetInt32 (0), "EnumParameterTest#4"); + // field 2 + Assert.AreEqual ("smallint", dr.GetDataTypeName (1), "EnumParameterTest#5"); + Assert.AreEqual ((short) Status.Error, dr.GetInt16 (1), "EnumParameterTest#6"); + // only one record should be returned + Assert.IsFalse (dr.Read (), "EnumParameterTest#7"); + } + } finally { + DBHelper.ExecuteNonQuery (conn, "if exists (select name from sysobjects " + + " where name like '#temp_Bug66630' and type like 'P') " + + " drop procedure #temp_Bug66630; "); + ConnectionManager.Instance.Sql.CloseConnection (); + } + } + + [Test] + public void CloneTest () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + SqlTransaction trans = conn.BeginTransaction (); + + cmd = new SqlCommand (); + cmd.Connection = conn; + cmd.Transaction = trans; + + SqlCommand clone = (((ICloneable) (cmd)).Clone ()) as SqlCommand; + Assert.AreSame (conn, clone.Connection); + Assert.AreSame (trans, clone.Transaction); + } + + [Test] + public void StoredProc_NoParameterTest () + { + string query = "create procedure #tmp_sp_proc as begin"; + query += " select 'data' end"; + SqlConnection conn = new SqlConnection (connectionString); + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = query; + conn.Open (); + cmd.ExecuteNonQuery (); + + cmd.CommandType = CommandType.StoredProcedure; + cmd.CommandText = "#tmp_sp_proc"; + using (SqlDataReader reader = cmd.ExecuteReader ()) { + if (reader.Read ()) + Assert.AreEqual ("data", reader.GetString (0), "#1"); + else + Assert.Fail ("#2 Select shud return data"); + } + conn.Close (); + } + + [Test] + [Category("NotWorking")] + public void StoredProc_ParameterTest () + { + string create_query = CREATE_TMP_SP_PARAM_TEST; + + SqlConnection conn = new SqlConnection (connectionString); + conn.Open (); + + SqlCommand cmd = conn.CreateCommand (); + int label = 0; + string error = string.Empty; + while (label != -1) { + try { + switch (label) { + case 0: + // Test BigInt Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "bigint")); + rpc_helper_function (cmd, SqlDbType.BigInt, 0, + Int64.MaxValue, Int64.MaxValue, + Int64.MaxValue, Int64.MaxValue); + rpc_helper_function (cmd, SqlDbType.BigInt, 0, + Int64.MinValue, Int64.MinValue, + Int64.MinValue, Int64.MinValue); + rpc_helper_function (cmd, SqlDbType.BigInt, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 1: + // Test Binary Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "binary(5)")); + rpc_helper_function (cmd, SqlDbType.Binary, 5, + new byte [] { 1, 2, 3, 4, 5 }, + new byte [] { 1, 2, 3, 4, 5 }, + new byte [] { 1, 2, 3, 4, 5 }, + new byte [] { 1, 2, 3, 4, 5 }); + /* + rpc_helper_function (cmd, SqlDbType.Binary, 5, + DBNull.Value, DBNull.Value, + DBNull.Value); + */ + rpc_helper_function (cmd, SqlDbType.Binary, 2, + new byte [0], + new byte [] { 0, 0, 0, 0, 0 }, + new byte [] { 0, 0 }, + new byte [] { 0, 0 }); + break; + case 2: + // Test Bit Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "bit")); + rpc_helper_function (cmd, SqlDbType.Bit, 0, + true, true, true, true); + rpc_helper_function (cmd, SqlDbType.Bit, 0, + false, false, false, false); + rpc_helper_function (cmd, SqlDbType.Bit, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 3: + // Testing Char + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "char(10)")); + rpc_helper_function (cmd, SqlDbType.Char, 10, + "characters", "characters", + "characters", "characters"); + /* + rpc_helper_function (cmd, SqlDbType.Char, 3, + "characters", "cha ", + "cha"); + rpc_helper_function (cmd, SqlDbType.Char, 3, + string.Empty, " ", + " "); + */ + rpc_helper_function (cmd, SqlDbType.Char, 5, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 4: + // Testing DateTime + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "datetime")); + rpc_helper_function (cmd, SqlDbType.DateTime, 0, "2079-06-06 23:59:00", + new DateTime (2079, 6, 6, 23, 59, 0), + new DateTime (2079, 6, 6, 23, 59, 0), + new DateTime (2079, 6, 6, 23, 59, 0)); + rpc_helper_function (cmd, SqlDbType.DateTime, 0, "2009-04-12 10:39:45", + new DateTime (2009, 4, 12, 10, 39, 45), + new DateTime (2009, 4, 12, 10, 39, 45), + new DateTime (2009, 4, 12, 10, 39, 45)); + rpc_helper_function (cmd, SqlDbType.DateTime, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 5: + // Test Decimal Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "decimal(10,2)")); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 10.665m, 10.67m, 11m, 10.67m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 0m, 0m, 0m, 0m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + -5.657m, -5.66m, -6m, -5.66m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + + // conversion + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + AttributeTargets.Constructor, + 32.0m, 32m, 32m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 4.325f, 4.33m, 4m, 4.33m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 10.0d, 10.00m, 10m, 10m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 10.665d, 10.67m, 11m, 10.67m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + -5.657d, -5.66m, -6m, -5.66m); + rpc_helper_function (cmd, SqlDbType.Decimal, 0, + 4, 4m, 4m, 4m); + break; + case 6: + // Test Float Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "float")); + rpc_helper_function (cmd, SqlDbType.Float, 0, + 10.0, 10.0, 10.0, 10.0); + rpc_helper_function (cmd, SqlDbType.Float, 0, + 10.54, 10.54, 10.54, 10.54); + rpc_helper_function (cmd, SqlDbType.Float, 0, + 0, 0d, 0d, 0d); + rpc_helper_function (cmd, SqlDbType.Float, 0, + -5.34, -5.34, -5.34, -5.34); + rpc_helper_function (cmd, SqlDbType.Float, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 7: + // Testing Image + /* NOT WORKING + DBHelper.ExecuteNonQuery (conn, + String.Format(create_query, "image")); + rpc_helper_function (cmd, SqlDbType.Image, 0, ); + rpc_helper_function (cmd, SqlDbType.Image, 0, ); + rpc_helper_function (cmd, SqlDbType.Image, 0, ); + /* NOT WORKING*/ + break; + case 8: + // Test Integer Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "int")); + rpc_helper_function (cmd, SqlDbType.Int, 0, + 10, 10, 10, 10); + rpc_helper_function (cmd, SqlDbType.Int, 0, + 0, 0, 0, 0); + rpc_helper_function (cmd, SqlDbType.Int, 0, + -5, -5, -5, -5); + rpc_helper_function (cmd, SqlDbType.Int, 0, + int.MaxValue, int.MaxValue, + int.MaxValue, int.MaxValue); + rpc_helper_function (cmd, SqlDbType.Int, 0, + int.MinValue, int.MinValue, + int.MinValue, int.MinValue); + rpc_helper_function (cmd, SqlDbType.Int, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 9: + // Test Money Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "money")); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 10m, 10m, 10m, 10m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 10.54, 10.54m, 10.54m, 10.54m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 0, 0m, 0m, 0m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -5.34, -5.34m, -5.34m, -5.34m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 5.34, 5.34m, 5.34m, 5.34m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -10.1234m, -10.1234m, -10.1234m, + -10.1234m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 10.1234m, 10.1234m, 10.1234m, + 10.1234m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -2000000000m, -2000000000m, + -2000000000m, -2000000000m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 2000000000m, 2000000000m, + 2000000000m, 2000000000m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.2345m, -200000000.2345m, + -200000000.2345m, -200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.2345m, 200000000.2345m, + 200000000.2345m, 200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + + // rounding tests + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234561m, -200000000.2346m, + -200000000.2346m, -200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234551m, -200000000.2346m, + -200000000.2346m, -200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234541m, -200000000.2345m, + -200000000.2345m, -200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234561m, 200000000.2346m, + 200000000.2346m, 200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234551m, 200000000.2346m, + 200000000.2346m, 200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234541m, 200000000.2345m, + 200000000.2345m, 200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234461m, -200000000.2345m, + -200000000.2345m, -200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234451m, -200000000.2345m, + -200000000.2345m, -200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234441m, -200000000.2344m, + -200000000.2344m, -200000000.2344m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234461m, 200000000.2345m, + 200000000.2345m, 200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234451m, 200000000.2345m, + 200000000.2345m, 200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234441m, 200000000.2344m, + 200000000.2344m, 200000000.2344m); + // FIXME: we round toward even in SqlParameter.ConvertToFrameworkType + /* + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234550m, -200000000.2346m, -200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234550m, 200000000.2346m, 200000000.2346m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + -200000000.234450m, -200000000.2345m, -200000000.2345m); + rpc_helper_function (cmd, SqlDbType.Money, 0, + 200000000.234450m, 200000000.2345m, 200000000.2345m); + */ + break; + case 23: + // Test NChar Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "nchar(10)")); + rpc_helper_function (cmd, SqlDbType.NChar, 10, + "characters", "characters", + "characters", "characters"); + rpc_helper_function (cmd, SqlDbType.NChar, 3, + "characters", "cha ", + "cha", "cha"); + rpc_helper_function (cmd, SqlDbType.NChar, 3, + string.Empty, " ", + " ", " "); + /* + rpc_helper_function (cmd, SqlDbType.NChar, 5, + DBNull.Value, DBNull.Value, + DBNull.Value); + */ + break; + case 10: + // Test NText Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "ntext")); + /* + rpc_helper_function (cmd, SqlDbType.NText, 0, "ntext"); + rpc_helper_function (cmd, SqlDbType.NText, 0, ""); + rpc_helper_function (cmd, SqlDbType.NText, 0, null); + */ + break; + case 11: + // Test NVarChar Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "nvarchar(10)")); + rpc_helper_function (cmd, SqlDbType.NVarChar, 10, + "nvarchar", "nvarchar", "nvarchar", + "nvarchar"); + rpc_helper_function (cmd, SqlDbType.NVarChar, 3, + "nvarchar", "nva", "nva", "nva"); + /* + rpc_helper_function (cmd, SqlDbType.NVarChar, 10, + string.Empty, string.Empty, string.Empty); + rpc_helper_function (cmd, SqlDbType.NVarChar, 10, + DBNull.Value, DBNull.Value, DBNull.Value); + */ + break; + case 12: + // Test Real Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "real")); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 10m, 10f, 10f, 10f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 10d, 10f, 10f, 10f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 0, 0f, 0f, 0f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 3.54d, 3.54f, 3.54f, 3.54f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 10, 10f, 10f, 10f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 10.5f, 10.5f, 10.5f, 10.5f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 3.5d, 3.5f, 3.5f, 3.5f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + 4.54m, 4.54f, 4.54f, 4.54f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + -4.54m, -4.54f, -4.54f, -4.54f); + rpc_helper_function (cmd, SqlDbType.Real, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 13: + // Test SmallDateTime Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "smalldatetime")); + rpc_helper_function (cmd, SqlDbType.SmallDateTime, 0, + "6/6/2079 11:59:00 PM", + new DateTime (2079, 6, 6, 23, 59, 0), + new DateTime (2079, 6, 6, 23, 59, 0), + new DateTime (2079, 6, 6, 23, 59, 0)); + rpc_helper_function (cmd, SqlDbType.SmallDateTime, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 14: + // Test SmallInt Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "smallint")); + rpc_helper_function (cmd, SqlDbType.SmallInt, 0, + 10, (short) 10, (short) 10, (short) 10); + rpc_helper_function (cmd, SqlDbType.SmallInt, 0, + -10, (short) -10, (short) -10, + (short) -10); + rpc_helper_function (cmd, SqlDbType.SmallInt, 0, + short.MaxValue, short.MaxValue, + short.MaxValue, short.MaxValue); + rpc_helper_function (cmd, SqlDbType.SmallInt, 0, + short.MinValue, short.MinValue, + short.MinValue, short.MinValue); + rpc_helper_function (cmd, SqlDbType.SmallInt, 0, + DBNull.Value, DBNull.Value, + DBNull.Value, DBNull.Value); + break; + case 15: + // Test SmallMoney Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "smallmoney")); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 10.0d, 10m, 10m, 10m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 0, 0m, 0m, 0m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 3.54d, 3.54m, 3.54m, 3.54m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 10, 10m, 10m, 10m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 10.5f, 10.5m, 10.5m, 10.5m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 3.5d, 3.5m, 3.5m, 3.5m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.54m, 4.54m, 4.54m, 4.54m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.54m, -4.54m, -4.54m, -4.54m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -214748.3648m, -214748.3648m, + -214748.3648m, -214748.3648m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 214748.3647m, 214748.3647m, 214748.3647m, + 214748.3647m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + DBNull.Value, DBNull.Value, DBNull.Value, + DBNull.Value); + + // rounding tests + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543361m, -4.5434m, -4.5434m, -4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543351m, -4.5434m, -4.5434m, -4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543341m, -4.5433m, -4.5433m, -4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543361m, 4.5434m, 4.5434m, 4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543351m, 4.5434m, 4.5434m, 4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543341m, 4.5433m, 4.5433m, 4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543261m, -4.5433m, -4.5433m, -4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543251m, -4.5433m, -4.5433m, -4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543241m, -4.5432m, -4.5432m, -4.5432m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543261m, 4.5433m, 4.5433m, 4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543251m, 4.5433m, 4.5433m, 4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543241m, 4.5432m, 4.5432m, 4.5432m); + // FIXME: we round toward even in SqlParameter.ConvertToFrameworkType + /* + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543350m, -4.5434m, -4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543350m, 4.5434m, 4.5434m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + -4.543250m, -4.5433m, -4.5433m); + rpc_helper_function (cmd, SqlDbType.SmallMoney, 0, + 4.543250m, 4.5433m, 4.5433m); + */ + break; + case 16: + // Test Text Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "text")); + /* + rpc_helper_function (cmd, SqlDbType.Text, 0, "text"); + rpc_helper_function (cmd, SqlDbType.Text, 0, ""); + rpc_helper_function (cmd, SqlDbType.Text, 0, null); + */ + break; + case 17: + // Test TimeStamp Param + /* NOT WORKING + DBHelper.ExecuteNonQuery (conn, + String.Format(create_query,"timestamp")); + rpc_helper_function (cmd, SqlDbType.TimeStamp, 0, ""); + rpc_helper_function (cmd, SqlDbType.TimeStamp, 0, ""); + rpc_helper_function (cmd, SqlDbType.TimeStamp, 0, null); + */ + break; + case 18: + // Test TinyInt Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "tinyint")); + rpc_helper_function (cmd, SqlDbType.TinyInt, 0, + 10.0d, (byte) 10, (byte) 10, + (byte) 10); + rpc_helper_function (cmd, SqlDbType.TinyInt, 0, + 0, (byte) 0, (byte) 0, (byte) 0); + rpc_helper_function (cmd, SqlDbType.TinyInt, 0, + byte.MaxValue, byte.MaxValue, + byte.MaxValue, byte.MaxValue); + rpc_helper_function (cmd, SqlDbType.TinyInt, 0, + byte.MinValue, byte.MinValue, + byte.MinValue, byte.MinValue); + break; + case 19: + // Test UniqueIdentifier Param + /* + DBHelper.ExecuteNonQuery (conn, + String.Format(create_query,"uniqueidentifier")); + rpc_helper_function (cmd, SqlDbType.UniqueIdentifier, 0, "0f159bf395b1d04f8c2ef5c02c3add96"); + rpc_helper_function (cmd, SqlDbType.UniqueIdentifier, 0, null); + */ + break; + case 20: + // Test VarBinary Param + /* NOT WORKING + DBHelper.ExecuteNonQuery (conn, + String.Format(create_query,"varbinary (10)")); + rpc_helper_function (cmd, SqlDbType.VarBinary, 0,); + rpc_helper_function (cmd, SqlDbType.VarBinary, 0,); + rpc_helper_function (cmd, SqlDbType.VarBinary, 0, null); + */ + break; + case 21: + // Test Varchar Param + DBHelper.ExecuteNonQuery (conn, + String.Format (create_query, "varchar(10)")); + rpc_helper_function (cmd, SqlDbType.VarChar, 7, + "VarChar", "VarChar", "VarChar", + "VarChar"); + rpc_helper_function (cmd, SqlDbType.VarChar, 5, + "Var", "Var", "Var", "Var"); + /* + rpc_helper_function (cmd, SqlDbType.VarChar, 3, + "Varchar", "Var", "Var"); + rpc_helper_function (cmd, SqlDbType.VarChar, 10, + string.Empty, string.Empty, string.Empty); + rpc_helper_function (cmd, SqlDbType.VarChar, 10, + DBNull.Value, DBNull.Value, + DBNull.Value); + */ + break; + case 22: + // Test Variant Param + /* NOT WORKING + DBHelper.ExecuteNonQuery (conn, + String.Format(create_query,"variant")); + rpc_helper_function (cmd, SqlDbType.Variant, 0, ); + rpc_helper_function (cmd, SqlDbType.Variant, 0, ); + rpc_helper_function (cmd, SqlDbType.Variant, 0, null); + */ + break; + default: + label = -2; + break; + } + } catch (AssertionException ex) { + error += String.Format (" Case {0} INCORRECT VALUE : {1}\n", label, ex.ToString ()); + } catch (Exception ex) { + error += String.Format (" Case {0} NOT WORKING : {1}\n", label, ex.ToString ()); + } + + label++; + if (label != -1) + DBHelper.ExecuteNonQuery (conn, string.Format ( + CultureInfo.InvariantCulture, + DROP_STORED_PROCEDURE, "#tmp_sp_param_test")); + } + + if (error.Length != 0) + Assert.Fail (error); + } + + private void rpc_helper_function (SqlCommand cmd, SqlDbType type, int size, object input, object expectedRead, object expectedOut, object expectedInOut) + { + cmd.Parameters.Clear (); + SqlParameter param1, param2, param3; + if (size != 0) { + param1 = new SqlParameter ("@param1", type, size); + param2 = new SqlParameter ("@param2", type, size); + param3 = new SqlParameter ("@param3", type, size); + } else { + param1 = new SqlParameter ("@param1", type); + param2 = new SqlParameter ("@param2", type); + param3 = new SqlParameter ("@param3", type); + } + + SqlParameter retval = new SqlParameter ("retval", SqlDbType.Int); + param1.Value = input; + param1.Direction = ParameterDirection.Input; + param2.Direction = ParameterDirection.Output; + param3.Direction = ParameterDirection.InputOutput; + param3.Value = input; + retval.Direction = ParameterDirection.ReturnValue; + cmd.Parameters.Add (param1); + cmd.Parameters.Add (param2); + cmd.Parameters.Add (param3); + cmd.Parameters.Add (retval); + cmd.CommandText = "#tmp_sp_param_test"; + cmd.CommandType = CommandType.StoredProcedure; + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#1"); + AreEqual (expectedRead, reader.GetValue (0), "#2"); + Assert.IsFalse (reader.Read (), "#3"); + } + + AreEqual (expectedOut, param2.Value, "#4"); + AreEqual (expectedInOut, param3.Value, "#5"); + Assert.AreEqual (5, retval.Value, "#6"); + } + + [Test] + public void OutputParamSizeTest1 () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = new SqlCommand (); + cmd.Connection = conn; + + cmd.CommandText = "create procedure #testsize (@p1 as varchar(10) output) as return"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#testsize"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.InputOutput; + p1.DbType = DbType.String; + p1.IsNullable = false; + cmd.Parameters.Add (p1); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // String[0]: the Size property has an invalid + // size of 0 + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void OutputParamSizeTest2 () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = new SqlCommand (); + cmd.Connection = conn; + + cmd.CommandText = "create procedure #testsize (@p1 as varchar(10) output) as return"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#testsize"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.Output; + p1.DbType = DbType.String; + p1.IsNullable = false; + cmd.Parameters.Add (p1); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // String[0]: the Size property has an invalid + // size of 0 + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void OutputParamSizeTest3 () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = new SqlCommand (); + cmd.Connection = conn; + + cmd.CommandText = "create procedure #testsize (@p1 as varchar(10) output) as return"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#testsize"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.InputOutput; + p1.DbType = DbType.String; + p1.IsNullable = true; + cmd.Parameters.Add (p1); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // String[0]: the Size property has an invalid + // size of 0 + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void OutputParamSizeTest4 () + { + conn = ConnectionManager.Instance.Sql.Connection; + cmd = new SqlCommand (); + cmd.Connection = conn; + + cmd.CommandText = "create procedure #testsize (@p1 as varchar(10) output) as return"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#testsize"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter (); + p1.ParameterName = "@p1"; + p1.Direction = ParameterDirection.Output; + p1.DbType = DbType.String; + p1.IsNullable = true; + cmd.Parameters.Add (p1); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // String[0]: the Size property has an invalid + // size of 0 + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] // bug #470579 + public void OutputParamTest () + { + SqlParameter newId, id; + + conn = ConnectionManager.Instance.Sql.Connection; + + cmd = conn.CreateCommand (); + cmd.CommandText = "set @NewId=@Id + 2"; + cmd.CommandType = CommandType.Text; + newId = cmd.Parameters.Add ("@NewId", SqlDbType.Int); + newId.Direction = ParameterDirection.Output; + id = cmd.Parameters.Add ("@Id", SqlDbType.Int); + id.Value = 3; + cmd.ExecuteNonQuery (); + + Assert.AreEqual (5, newId.Value, "#A1"); + Assert.AreEqual (3, id.Value, "#A2"); + + cmd = conn.CreateCommand (); + cmd.CommandText = "set @NewId=@Id + 2"; + cmd.CommandType = CommandType.Text; + newId = cmd.Parameters.Add ("NewId", SqlDbType.Int); + newId.Direction = ParameterDirection.Output; + id = cmd.Parameters.Add ("Id", SqlDbType.Int); + id.Value = 6; + cmd.ExecuteNonQuery (); + + Assert.AreEqual (8, newId.Value, "#B1"); + Assert.AreEqual (6, id.Value, "#B2"); + } + + [Test] + public void SmallMoney_Overflow_Max () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + DBHelper.ExecuteNonQuery (conn, string.Format ( + CultureInfo.InvariantCulture, CREATE_TMP_SP_TYPE_TEST, + "SMALLMONEY")); + //decimal overflow = 214748.36471m; + decimal overflow = 214748.3648m; + + cmd = conn.CreateCommand (); + cmd.CommandText = "#tmp_sp_type_test"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter param = cmd.Parameters.Add ("@param", + SqlDbType.SmallMoney); + param.Value = overflow; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#1"); + } catch (OverflowException ex) { + // SqlDbType.SmallMoney overflow. Value '214748.36471' + // is out of range. Must be between -214,748.3648 and 214,748.3647 + Assert.AreEqual (typeof (OverflowException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "'{0}'", + overflow)) != -1, "#5:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "{0:N4}", + SMALLMONEY_MIN)) != -1, "#6:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "{0:N4}", + SMALLMONEY_MAX)) != -1, "#7:" + ex.Message); + } finally { + DBHelper.ExecuteNonQuery (conn, string.Format ( + CultureInfo.InvariantCulture, + DROP_STORED_PROCEDURE, "#tmp_sp_type_test")); + } + } + + [Test] + public void SmallMoney_Overflow_Min () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + DBHelper.ExecuteNonQuery (conn, string.Format ( + CultureInfo.InvariantCulture, CREATE_TMP_SP_TYPE_TEST, + "SMALLMONEY")); + //decimal overflow = -214748.36481m; + decimal overflow = -214748.3649m; + + cmd = conn.CreateCommand (); + cmd.CommandText = "#tmp_sp_type_test"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter param = cmd.Parameters.Add ("@param", + SqlDbType.SmallMoney); + param.Value = overflow; + + try { + cmd.ExecuteScalar (); + Assert.Fail ("#1"); + } catch (OverflowException ex) { + // SqlDbType.SmallMoney overflow. Value '-214748,36481' + // is out of range. Must be between -214,748.3648 and 214,748.3647 + Assert.AreEqual (typeof (OverflowException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "'{0}'", + overflow)) != -1, "#5:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "{0:N4}", + SMALLMONEY_MIN)) != -1, "#6:" + ex.Message); + Assert.IsTrue (ex.Message.IndexOf (string.Format ( + CultureInfo.InvariantCulture, "{0:N4}", + SMALLMONEY_MAX)) != -1, "#7:" + ex.Message); + } finally { + DBHelper.ExecuteNonQuery (conn, string.Format ( + CultureInfo.InvariantCulture, + DROP_STORED_PROCEDURE, "#tmp_sp_type_test")); + } + } + + [Test] + public void NotificationTest () + { + cmd = new SqlCommand (); + SqlNotificationRequest notification = new SqlNotificationRequest("MyNotification","MyService",15); + Assert.AreEqual (null, cmd.Notification, "#1 The default value for this property should be null"); + cmd.Notification = notification; + Assert.AreEqual ("MyService", cmd.Notification.Options, "#2 The value should be MyService as the constructor is initiated with this value"); + Assert.AreEqual (15, cmd.Notification.Timeout, "#2 The value should be 15 as the constructor is initiated with this value"); + } + + [Test] + public void NotificationAutoEnlistTest () + { + cmd = new SqlCommand (); + Assert.AreEqual (true, cmd.NotificationAutoEnlist, "#1 Default value of the property should be true"); + cmd.NotificationAutoEnlist = false; + Assert.AreEqual (false, cmd.NotificationAutoEnlist, "#2 The value of the property should be false after setting it to false"); + } + + [Test] + public void BeginExecuteXmlReaderTest () + { + cmd = new SqlCommand (); + string connectionString1 = null; + connectionString1 = ConnectionManager.Instance.Sql.ConnectionString + ";Asynchronous Processing=true"; + try { + SqlConnection conn1 = new SqlConnection (connectionString1); + conn1.Open (); + cmd.CommandText = "Select lname from employee where id<2 FOR XML AUTO, XMLDATA"; + cmd.Connection = conn1; + + IAsyncResult result = cmd.BeginExecuteXmlReader (); + XmlReader reader = cmd.EndExecuteXmlReader (result); + while (reader.Read ()) { + if (reader.LocalName.ToString () == "employee") + Assert.AreEqual ("kumar", reader["lname"], "#1 "); + } + } finally { + ConnectionManager.Instance.Sql.CloseConnection (); + } + } + + [Test] + [Ignore("MS .NET doesn't throw IOE here. TODO: check corefx")] + public void BeginExecuteXmlReaderExceptionTest () + { + cmd = new SqlCommand (); + try { + SqlConnection conn = new SqlConnection (connectionString); + conn.Open (); + cmd.CommandText = "Select lname from employee where id<2 FOR XML AUTO, XMLDATA"; + cmd.Connection = conn; + + try { + /*IAsyncResult result = */cmd.BeginExecuteXmlReader (); + } catch (InvalidOperationException) { + Assert.AreEqual (ConnectionManager.Instance.Sql.ConnectionString, connectionString, "#1 Connection string has changed"); + return; + } + Assert.Fail ("Expected Exception InvalidOperationException not thrown"); + } finally { + ConnectionManager.Instance.Sql.CloseConnection (); + } + } + + [Test] + public void SqlCommandDisposeTest () + { + IDataReader reader = null; + conn = ConnectionManager.Instance.Sql.Connection; + try { + + IDbCommand command = conn.CreateCommand (); + try { + string sql = "SELECT * FROM employee"; + command.CommandText = sql; + reader = command.ExecuteReader (); + } finally { + command.Dispose (); + } + while (reader.Read ()) ; + } finally { + reader.Dispose (); + ConnectionManager.Instance.Sql.CloseConnection (); + } + } + + private void bug326182_OutputParamMixupTestCommon (int paramOrder, + out int param0Val, + out int param1Val, + out int param2Val, + out int param3Val, + out int rvalVal) + { + conn = ConnectionManager.Instance.Sql.Connection; + try { + + try { + SqlParameter param0 = new SqlParameter ("@param0", SqlDbType.Int); + param0.Direction = ParameterDirection.Output; + SqlParameter param1 = new SqlParameter ("@param1", SqlDbType.Int); + param1.Direction = ParameterDirection.Output; + SqlParameter param2 = new SqlParameter ("@param2", SqlDbType.Int); + param2.Direction = ParameterDirection.Output; + SqlParameter param3 = new SqlParameter ("@param3", SqlDbType.Int); + param3.Direction = ParameterDirection.Output; + SqlParameter rval = new SqlParameter ("@RETURN_VALUE", SqlDbType.Int); + rval.Direction = ParameterDirection.ReturnValue; + + cmd = conn.CreateCommand (); + cmd.CommandText = "dbo.[sp_326182a]"; + cmd.CommandType = CommandType.StoredProcedure; + + switch (paramOrder) { + case 1: cmd.Parameters.Add (param0); + cmd.Parameters.Add (param1); + cmd.Parameters.Add (rval); + cmd.Parameters.Add (param2); + cmd.Parameters.Add (param3); + break; + case 2: cmd.Parameters.Add (rval); + cmd.Parameters.Add (param1); + cmd.Parameters.Add (param0); + cmd.Parameters.Add (param2); + cmd.Parameters.Add (param3); + break; + default: cmd.Parameters.Add (param0); + cmd.Parameters.Add (param1); + cmd.Parameters.Add (param2); + cmd.Parameters.Add (param3); + cmd.Parameters.Add (rval); + break; + } + + cmd.ExecuteNonQuery (); + + /* Copy the param values to variables, just in case if + * tests fail, we don't want the created sp to exist */ + param3Val = (int) cmd.Parameters ["@param3"].Value; + param1Val = (int) cmd.Parameters ["@param1"].Value; + rvalVal = (int) cmd.Parameters ["@RETURN_VALUE"].Value; + param2Val = (int) cmd.Parameters ["@param2"].Value; + param0Val = (int) cmd.Parameters ["@param0"].Value; + } finally { + cmd.Dispose (); + cmd = null; + } + } finally { + ConnectionManager.Instance.Sql.CloseConnection (); + conn = null; + } + } + + [Test] + public void bug326182_OutputParamMixupTest_Normal () + { + int param0Val, param1Val, param2Val, param3Val, rvalVal; + + //param0Val = param1Val = param2Val = param3Val = rvalVal = 0; + + bug326182_OutputParamMixupTestCommon (0, out param0Val, out param1Val, + out param2Val, out param3Val, out rvalVal); + Assert.AreEqual (103, param3Val); + Assert.AreEqual (101, param1Val); + Assert.AreEqual (2, rvalVal); + Assert.AreEqual (102, param2Val); + Assert.AreEqual (100, param0Val); + } + + [Test] + public void bug326182_OutputParamMixupTest_RValInBetween () + { + int param0Val, param1Val, param2Val, param3Val, rvalVal; + + bug326182_OutputParamMixupTestCommon (1, out param0Val, out param1Val, + out param2Val, out param3Val, out rvalVal); + Assert.AreEqual (103, param3Val); + Assert.AreEqual (101, param1Val); + Assert.AreEqual (2, rvalVal); + Assert.AreEqual (102, param2Val); + Assert.AreEqual (100, param0Val); + } + + [Test] + public void bug326182_OutputParamMixupTest_RValFirst () + { + int param0Val, param1Val, param2Val, param3Val, rvalVal; + + bug326182_OutputParamMixupTestCommon (2, out param0Val, out param1Val, + out param2Val, out param3Val, out rvalVal); + Assert.AreEqual (103, param3Val); + Assert.AreEqual (101, param1Val); + Assert.AreEqual (2, rvalVal); + Assert.AreEqual (102, param2Val); + Assert.AreEqual (100, param0Val); + } + + [Test] + public void DeriveParameterTest_FullSchema () + { + string create_tbl = "CREATE TABLE decimalCheck (deccheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE sp_bug584833(@deccheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO decimalCheck values (@deccheck)" + Environment.NewLine + + "SELECT @deccheck=deccheck from decimalCheck" + Environment.NewLine + + "END"; + + conn = ConnectionManager.Instance.Sql.Connection; + try { + cmd = conn.CreateCommand (); + cmd.CommandText = create_tbl; + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "dbo.sp_bug584833"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlCommandBuilder.DeriveParameters (cmd); + Assert.AreEqual (2, cmd.Parameters.Count, "#DPT - FullSchema - Parameter count mismatch"); + Assert.AreEqual ("@deccheck", cmd.Parameters[1].ParameterName, "#DPT - FullSchema - Parameter name mismatch"); + Assert.AreEqual (SqlDbType.Decimal, cmd.Parameters[1].SqlDbType, "#DPT - FullSchema - Parameter type mismatch"); + } finally { + cmd.Parameters.Clear (); + cmd.CommandText = "drop procedure sp_bug584833"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + cmd.CommandText = "drop table decimalCheck"; + cmd.ExecuteNonQuery (); + cmd.Dispose (); + cmd = null; + ConnectionManager.Instance.Sql.CloseConnection (); + conn = null; + } + + } + + [Test] + public void DeriveParameterTest_SPName () + { + string create_tbl = "CREATE TABLE decimalCheck (deccheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE sp_bug584833(@deccheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO decimalCheck values (@deccheck)" + Environment.NewLine + + "SELECT @deccheck=deccheck from decimalCheck" + Environment.NewLine + + "END"; + + conn = ConnectionManager.Instance.Sql.Connection; + try { + + cmd = conn.CreateCommand (); + cmd.CommandText = create_tbl; + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "sp_bug584833"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlCommandBuilder.DeriveParameters (cmd); + Assert.AreEqual (2, cmd.Parameters.Count, "#DPT - SPName - Parameter count mismatch"); + Assert.AreEqual ("@deccheck", cmd.Parameters[1].ParameterName, "#DPT - SPName - Parameter name mismatch"); + Assert.AreEqual (SqlDbType.Decimal, cmd.Parameters[1].SqlDbType, "#DPT - SPName - Parameter type mismatch"); + } finally { + cmd.Parameters.Clear (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "drop procedure sp_bug584833"; + cmd.ExecuteNonQuery (); + cmd.CommandText = "drop table decimalCheck"; + cmd.ExecuteNonQuery (); + cmd.Dispose (); + cmd = null; + ConnectionManager.Instance.Sql.CloseConnection (); + conn = null; + } + } + + [Test] + public void DeriveParameterTest_UserSchema () + { + string create_tbl = "CREATE TABLE decimalCheck (deccheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE sp_bug584833(@deccheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO decimalCheck values (@deccheck)" + Environment.NewLine + + "SELECT @deccheck=deccheck from decimalCheck" + Environment.NewLine + + "END"; + + try { + conn = ConnectionManager.Instance.Sql.Connection; + + cmd = conn.CreateCommand (); + cmd.CommandText = create_tbl; + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "dbo.sp_bug584833"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlCommandBuilder.DeriveParameters (cmd); + Assert.AreEqual (2, cmd.Parameters.Count, "#DPT - user schema - Parameter count mismatch"); + Assert.AreEqual ("@deccheck", cmd.Parameters[1].ParameterName, "#DPT - user schema - Parameter name mismatch"); + Assert.AreEqual (SqlDbType.Decimal, cmd.Parameters[1].SqlDbType, "#DPT - user schema - Parameter type mismatch"); + } finally { + cmd.Parameters.Clear (); + cmd.CommandType = CommandType.Text; + cmd.CommandText = "drop procedure dbo.sp_bug584833"; + cmd.ExecuteNonQuery (); + cmd.CommandText = "drop table decimalCheck"; + cmd.ExecuteNonQuery (); + cmd.Dispose (); + cmd = null; + ConnectionManager.Instance.Sql.CloseConnection (); + conn = null; + } + } + + [Test] // bug#561667 + public void CmdDispose_DataReaderReset () + { + conn = ConnectionManager.Instance.Sql.Connection; + try + { + string query1 = "SELECT fname FROM employee where lname='kumar'"; + string query2 = "SELECT type_int FROM numeric_family where type_bit = 1"; + DataTable t = null; + + t = GetColumns(conn, query1); + Assert.AreEqual ("suresh", t.Rows[0][0], "CmdDD#1: Query1 result mismatch"); + t = GetColumns(conn, query2); + Assert.AreEqual (int.MaxValue, t.Rows[0][0], "CmdDD#2: Query2 result mismatch"); + } finally { + ConnectionManager.Instance.Sql.CloseConnection (); + conn = null; + } + } + + private DataTable GetColumns(DbConnection connection, string query) + { + DataTable t = new DataTable("Columns"); + using (DbCommand c = connection.CreateCommand()) + { + c.CommandText = query; + t.Load(c.ExecuteReader()); + } + return t; + } + + // used as workaround for bugs in NUnit 2.2.0 + static void AreEqual (object x, object y, string msg) + { + if (x == null && y == null) + return; + if ((x == null || y == null)) + throw new AssertionException (string.Format (CultureInfo.InvariantCulture, + "Expected: {0}, but was: {1}. {2}", + x == null ? "" : x, y == null ? "" : y, msg)); + + bool isArrayX = x.GetType ().IsArray; + bool isArrayY = y.GetType ().IsArray; + + if (isArrayX && isArrayY) { + Array arrayX = (Array) x; + Array arrayY = (Array) y; + + if (arrayX.Length != arrayY.Length) + throw new AssertionException (string.Format (CultureInfo.InvariantCulture, + "Length of arrays differs. Expected: {0}, but was: {1}. {2}", + arrayX.Length, arrayY.Length, msg)); + + for (int i = 0; i < arrayX.Length; i++) { + object itemX = arrayX.GetValue (i); + object itemY = arrayY.GetValue (i); + if (!itemX.Equals (itemY)) + throw new AssertionException (string.Format (CultureInfo.InvariantCulture, + "Arrays differ at position {0}. Expected: {1}, but was: {2}. {3}", + i, itemX, itemY, msg)); + } + } else if (!x.Equals (y)) { + throw new AssertionException (string.Format (CultureInfo.InvariantCulture, + "Expected: {0} ({1}), but was: {2} ({3}). {4}", + x, x.GetType (), y, y.GetType (), msg)); + } + } + + int ClientVersion { + get { + return (engine.ClientVersion); + } + } + + private enum Status + { + OK = 0, + Error = 3 + } + + private readonly string CREATE_TMP_SP_PARAM_TEST = + "CREATE PROCEDURE #tmp_sp_param_test (" + Environment.NewLine + + " @param1 {0}," + Environment.NewLine + + " @param2 {0} output," + Environment.NewLine + + " @param3 {0} output)" + Environment.NewLine + + "AS" + Environment.NewLine + + "BEGIN" + Environment.NewLine + + " SELECT @param1" + Environment.NewLine + + " SET @param2=@param1" + Environment.NewLine + + " RETURN 5" + Environment.NewLine + + "END"; + + private readonly string CREATE_TMP_SP_TEMP_INSERT_PERSON = ("create procedure #sp_temp_insert_employee ( " + Environment.NewLine + + "@fname varchar (20), " + Environment.NewLine + + "@dob datetime, " + Environment.NewLine + + "@doj datetime output " + Environment.NewLine + + ") " + Environment.NewLine + + "as " + Environment.NewLine + + "begin" + Environment.NewLine + + "declare @id int;" + Environment.NewLine + + "select @id = max (id) from employee;" + Environment.NewLine + + "set @id = @id + 6000 + 1;" + Environment.NewLine + + "set @doj = getdate();" + Environment.NewLine + + "insert into employee (id, fname, dob, doj) values (@id, @fname, @dob, @doj);" + Environment.NewLine + + "return @id;" + Environment.NewLine + + "end"); + + private readonly string DROP_TMP_SP_TEMP_INSERT_PERSON = ("if exists (select name from sysobjects where " + Environment.NewLine + + "name = '#sp_temp_insert_employee' and type = 'P') " + Environment.NewLine + + "drop procedure #sp_temp_insert_employee; "); + + private static readonly string CREATE_TMP_SP_TYPE_TEST = + "CREATE PROCEDURE #tmp_sp_type_test " + + "(" + + " @param {0}" + + ") AS SELECT @param"; + private static readonly string DROP_STORED_PROCEDURE = + "DROP PROCEDURE {0}"; + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionStringBuilderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionStringBuilderTest.cs new file mode 100644 index 0000000000..82df6f1529 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionStringBuilderTest.cs @@ -0,0 +1,182 @@ +// SqlConnectionStringBuilderTest.cs - NUnit Test Cases for Testing the +// SqlConnectionStringBuilder class +// +// Author: +// Sureshkumar T (tsureshkumar@novell.com) +// +// +// Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + + +#region Using directives + +using System; +using System.Text; +using System.Collections; +using System.Data; +using System.Data.SqlClient; + +using NUnit.Framework; + +#endregion + +namespace MonoTests.System.Data.Connected.SqlClient +{ + + [TestFixture] + [Category ("sqlserver")] + public class SqlConnectionStringBuilderTest + { + private SqlConnectionStringBuilder builder = null; + + [Test] + public void DefaultValuestTest () + { + builder = new SqlConnectionStringBuilder (); + Assert.AreEqual ("", builder.ConnectionString, "#DV1 default values is wrong"); + } + + [Test] + public void DefaultValuestTest2 () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;"); + Assert.AreEqual ("Data Source=localhost", builder.ConnectionString, "#DVT1 default values is wrong"); + } + + [Test] + public void PropertiesTest () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;"); + builder.AsynchronousProcessing = true; + builder.ApplicationName = "mono test"; + Assert.AreEqual (true, + builder.ConnectionString.Contains ("Asynchronous Processing=True"), + "#PT1 boolean value must be true"); + } + + [Test] + public void ItemTest () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;"); + builder ["Network Library"] = "DBMSSOCN"; + Assert.AreEqual (true, + builder.ConnectionString.Contains ("Network Library=dbmssocn"), + "#PT1 network library should exist"); + } + + public void NullTest () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;Network=DBMSSOCN"); + builder ["Network Library"] = null; + Assert.AreEqual ("Data Source=localhost", builder.ConnectionString, + "#NT1 should remove the key if set with null"); + } + + public void ContainsKeyTest () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;Network=DBMSSOCN"); + Assert.AreEqual (true, builder.ContainsKey ("NETWORK"), + "#CKT1 should say true"); + Assert.AreEqual (false, builder.ContainsKey ("ABCD"), + "#CKT2 should say false"); + } + + [Test, ExpectedException (typeof (ArgumentException))] + public void InvalidKeyTest () + { + builder = new SqlConnectionStringBuilder ("SERVER=localhost;Network=DBMSSOCN"); + int value = (int) builder ["ABCD"]; + value++; // to avoid warning + } + + [Test] + public void RemoveTest () + { + builder = new SqlConnectionStringBuilder ("SERVER = localhost ;Network=DBMSSOCN"); + // non existing key + Assert.AreEqual (false, builder.Remove ("ABCD"), + "#RT1 cannot remove non existant key"); + Assert.AreEqual (true, builder.Remove ("NETWORK library"), + "#RT2 should remove the key"); + Assert.AreEqual ("Data Source=localhost", builder.ConnectionString, + "#RT3 should have removed the key"); + } + + [Test] + public void TrustServerCertificateTest () + { + builder = new SqlConnectionStringBuilder (); + Assert.AreEqual (false, builder.TrustServerCertificate, "#1 The default value should be false"); + builder.TrustServerCertificate = true; + Assert.AreEqual (true, builder.TrustServerCertificate, "#2 The value returned should be true after setting the value of TrustServerCertificate to true"); + Assert.AreEqual ("TrustServerCertificate=True", builder.ConnectionString, "#3 The value of the key TrustServerCertificate should be added to the connection string"); + } + + [Test] + public void TypeSystemVersionTest () + { + builder = new SqlConnectionStringBuilder (); + Assert.AreEqual ("Latest", builder.TypeSystemVersion, "#1 The default value for the property should be Latest"); + builder.TypeSystemVersion = "SQL Server 2005"; + Assert.AreEqual ("SQL Server 2005", builder.TypeSystemVersion, "#2 The value for the property should be SQL Server 2005 after setting this value"); + Assert.AreEqual ("Type System Version=\"SQL Server 2005\"", builder.ConnectionString, "#3 The value of the key Type System Version should be added to the connection string"); + } + + [Test] + public void UserInstanceTest () + { + builder = new SqlConnectionStringBuilder (); + Assert.AreEqual (false, builder.UserInstance, "#1 The default value for the property should be false"); + builder.UserInstance = true; + Assert.AreEqual (true, builder.UserInstance, "#2 The value for the property should be true after setting its value to true"); + Assert.AreEqual ("User Instance=True", builder.ConnectionString, "#3 The value of the key User Instance should be added to the connection string"); + } + + [Test] + public void SettingUserInstanceTest () + { + builder = new SqlConnectionStringBuilder (); + builder["User Instance"] = true; + Assert.AreEqual ("User Instance=True", builder.ConnectionString, "#1 The value of the key User Instance should be added to the connection string"); + } + + [Test] + public void ContextConnectionTest () + { + builder = new SqlConnectionStringBuilder (); + Assert.AreEqual (false, builder.ContextConnection, "#1 The default value for the property should be false"); + builder.ContextConnection = true; + Assert.AreEqual (true, builder.ContextConnection, "#2 The value for the property should be true after setting its value to true"); + Assert.AreEqual ("Context Connection=True", builder.ConnectionString, "#3 The value of the key Context Connection should be added to the connection string"); + } + + [Test] + public void SettingContextConnectionTest () + { + builder = new SqlConnectionStringBuilder (); + builder["Context Connection"] = true; + Assert.AreEqual ("Context Connection=True", builder.ConnectionString, "#1 The value of the key Context Connection should be added to the connection string"); + } + } +} + diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionTest.cs new file mode 100644 index 0000000000..d784e828ee --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlConnectionTest.cs @@ -0,0 +1,1415 @@ +// +// SqlConnectionTest.cs - NUnit Test Cases for testing the +// SqlConnection class +// Author: +// Senganal T (tsenganal@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Collections; +using System.Data; +using System.Data.SqlClient; +using System.Net; +using System.Threading; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlConnectionTest + { + SqlConnection conn; + String connectionString; + ArrayList events; + EngineConfig engine; + + [SetUp] + public void SetUp () + { + events = new ArrayList (); + connectionString = ConnectionManager.Instance.Sql.ConnectionString; + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [TearDown] + public void TearDown () + { + if (conn != null) + conn.Dispose (); + if (connectionString != null) + SqlConnection.ClearAllPools (); + } + + [Test] + public void OverloadedConstructorTest () + { + //check synonyms. + //do i need to check for all the synonyms.. + conn = new SqlConnection ("Timeout=10;Connect Timeout=20;Connection Timeout=30"); + Assert.AreEqual (30, conn.ConnectionTimeout, "#A1"); + conn = new SqlConnection ("Connect Timeout=100;Connection Timeout=200;Timeout=300"); + Assert.AreEqual (300, conn.ConnectionTimeout, "#A2"); + conn = new SqlConnection ("Connection Timeout=1000;Timeout=2000;Connect Timeout=3000"); + Assert.AreEqual (3000, conn.ConnectionTimeout, "#A3"); + + //'==' doesent work correctly in both msdotnet and mono + /* + conn = new SqlConnection ("server=local==host;database=tmp;"); + Assert.AreEqual ("local==host", conn.DataSource, + "# Datasource name is set incorrectly"); + */ + string connStr = "Server='loca\"lhost';Database='''Db'; packet Size=\"512\";" + + "connect Timeout=20;Workstation Id=\"'\"\"desktop\";"; + conn = new SqlConnection (connStr); + Assert.AreEqual (connStr , conn.ConnectionString , "#B1"); + Assert.AreEqual ("loca\"lhost" , conn.DataSource , "#B2"); + Assert.AreEqual ("'Db" , conn.Database , "#B3"); + Assert.AreEqual (512 , conn.PacketSize , "#B4"); + Assert.AreEqual (20 , conn.ConnectionTimeout , "#B5"); + Assert.AreEqual ("'\"desktop" , conn.WorkstationId , "#B6"); + } + + [Test] + public void Open () + { + conn = new SqlConnection (connectionString); + conn.StateChange += new StateChangeEventHandler (Connection_StateChange); + conn.Open (); + + Assert.AreEqual (ConnectionState.Open, conn.State, "#1"); + Assert.AreEqual (1, events.Count, "#2"); + StateChangeEventArgs args = events [0] as StateChangeEventArgs; + Assert.IsNotNull (args, "#3"); + Assert.AreEqual (ConnectionState.Closed, args.OriginalState, "#4"); + Assert.AreEqual (ConnectionState.Open, args.CurrentState, "#5"); + + conn.Close (); + } + + [Test] + public void Open_Connection_Open () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + try { + conn.Open (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // The connection was not closed. The connection's + // current state is open + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } finally { + conn.Close (); + } + } + + [Test] + public void Open_ConnectionString_LoginInvalid () + { + // login invalid + conn = new SqlConnection (connectionString + "user id=invalidLogin"); + try { + conn.Open (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Login failed for user 'invalidLogin' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 14, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (18456, ex.Number, "#7"); + Assert.AreEqual ((byte) 1, ex.State, "#8"); + } finally { + conn.Close (); + } + } + + [Test] + public void Open_ConnectionString_DatabaseInvalid () + { + conn = new SqlConnection (connectionString + "database=invalidDB"); + try { + conn.Open (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Cannot open database "invalidDB" requested + // by the login. The login failed + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 14, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (18456, ex.Number, "#7"); + Assert.AreEqual ((byte) 1, ex.State, "#8"); + } finally { + conn.Close (); + } + + } + + [Test] + public void Open_ConnectionString_PasswordInvalid () + { + // password invalid + conn = new SqlConnection (connectionString + ";password=invalidPassword"); + try { + conn.Open (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Login failed for user '...' + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 14, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (18456, ex.Number, "#6"); + Assert.AreEqual ((byte) 1, ex.State, "#7"); + } finally { + conn.Close (); + } + } + + [Test] + public void Open_ConnectionString_ServerInvalid () + { + Assert.Ignore ("Long running"); + + // server invalid + conn = new SqlConnection (connectionString + ";server=invalidServerName"); + try { + conn.Open (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // An error has occurred while establishing a + // connection to the server... + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 20, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (53, ex.Number, "#6"); + Assert.AreEqual ((byte) 0, ex.State, "#7"); + } finally { + conn.Close (); + } + } + + [Test] // bug #383061 + [Category("NotWorking")] + public void Open_MaxPoolSize_Reached () + { + connectionString += ";Pooling=true;Connection Lifetime=6;Connect Timeout=3;Max Pool Size=2"; + + SqlConnection conn1 = new SqlConnection (connectionString); + conn1.Open (); + + SqlConnection conn2 = new SqlConnection (connectionString); + conn2.Open (); + + DateTime start = DateTime.Now; + + try { + using (SqlConnection sqlConnection = new SqlConnection (connectionString)) { + sqlConnection.Open (); + } + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // System.InvalidOperationException: Timeout expired. + // The timeout period elapsed prior to obtaining a + // connection from the pool. This may have occurred + // because all pooled connections were in use and max + // pool size was reached. + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + TimeSpan elapsed = DateTime.Now - start; + + Assert.IsTrue (elapsed.TotalSeconds >= 3, "#B1:" + elapsed.TotalSeconds); + Assert.IsTrue (elapsed.TotalSeconds < 4, "#B2:" + elapsed.TotalSeconds); + + conn2.Close (); + + // as the second connection is closed, we should now be + // able to open a new connection (which essentially + // uses the pooled connection from conn2) + SqlConnection conn3 = new SqlConnection (connectionString); + conn3.Open (); + conn3.Close (); + + conn1.Close (); + } + + [Test] // bug #412574 + public void Close () + { + conn = new SqlConnection (connectionString); + conn.Open (); + conn.StateChange += new StateChangeEventHandler (Connection_StateChange); + conn.Close (); + + Assert.AreEqual (ConnectionState.Closed, conn.State, "#1"); + Assert.AreEqual (1, events.Count, "#2"); + StateChangeEventArgs args = events [0] as StateChangeEventArgs; + Assert.IsNotNull (args, "#3"); + Assert.AreEqual (ConnectionState.Open, args.OriginalState, "#4"); + Assert.AreEqual (ConnectionState.Closed, args.CurrentState, "5"); + + conn.Close (); + + Assert.AreEqual (1, events.Count, "#6"); + } + + [Test] + public void ChangeDatabase () + { + conn = new SqlConnection (connectionString); + conn.Open (); + conn.ChangeDatabase ("master"); + Assert.AreEqual ("master", conn.Database); + } + + [Test] + public void ChangeDatabase_DatabaseName_DoesNotExist () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + String database = conn.Database; + + try { + conn.ChangeDatabase ("doesnotexist"); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Could not locate entry in sysdatabases for + // database 'doesnotexist'. No entry found with + // that name. Make sure that the name is entered + // correctly. + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.IsTrue (ex.Message.IndexOf ("'doesnotexist'") != -1, "#6"); + Assert.AreEqual (911, ex.Number, "#7"); + Assert.AreEqual ((byte) 1, ex.State, "#8"); + + Assert.AreEqual (database, conn.Database, "#9"); + } finally { + conn.Close (); + } + } + + [Test] + public void ChangeDatabase_DatabaseName_Empty () + { + conn = new SqlConnection (connectionString); + conn.Open (); + try { + conn.ChangeDatabase (string.Empty); + Assert.Fail ("#1"); + } catch (ArgumentException ex) { + // Database cannot be null, the empty string, + // or string of only whitespace + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsNull (ex.ParamName); + } + } + + [Test] + public void ChangeDatabase_DatabaseName_Null () + { + conn = new SqlConnection (connectionString); + conn.Open (); + try { + conn.ChangeDatabase ((string) null); + Assert.Fail ("#1"); + } catch (ArgumentException ex) { + // Database cannot be null, the empty string, + // or string of only whitespace + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsNull (ex.ParamName); + } + } + + [Test] // bug #412581 + public void ChangeDatabase_DatabaseName_Whitespace () + { + Assert.Ignore ("bug #412581"); + + conn = new SqlConnection (connectionString); + conn.Open (); + try { + conn.ChangeDatabase (" "); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Could not locate entry in sysdatabases for + // database ' '. No entry found with that name. + // Make sure that the name is entered correctly + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.IsTrue (ex.Message.IndexOf ("' '") != -1, "#6"); + Assert.AreEqual (911, ex.Number, "#7"); + Assert.AreEqual ((byte) 1, ex.State, "#8"); + } + } + + [Test] + public void ClearAllPools () + { + SqlConnection conn1 = new SqlConnection (connectionString + ";Pooling=false"); + conn1.Open (); + + int initial_connection_count = GetConnectionCount (conn1); + + SqlConnection conn2 = new SqlConnection (connectionString + ";App=A"); + conn2.Open (); + conn2.Close (); + + SqlConnection conn3 = new SqlConnection (connectionString + ";App=B"); + conn3.Open (); + conn3.Close (); + + Assert.AreEqual (initial_connection_count + 2, GetConnectionCount (conn1), "#1"); + + SqlConnection.ClearAllPools (); + + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn1), "#2"); + conn1.Close (); + } + + [Test] // bug #443131 + [Category("NotWorking")] + public void ClearPool () + { + SqlConnection conn1 = new SqlConnection (connectionString); + conn1.Open (); + + int initial_connection_count = GetConnectionCount (conn1); + + SqlConnection conn2 = new SqlConnection (connectionString); + conn2.Open (); + + SqlConnection conn3 = new SqlConnection (connectionString); + conn3.Open (); + conn3.Close (); + + Assert.AreEqual (initial_connection_count + 2, GetConnectionCount (conn1), "#1"); + + SqlConnection.ClearPool (conn1); + + // check if pooled connections that were not in use are + // actually closed + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn1), "#2"); + + conn2.Close (); + + // check if connections that were in use when the pool + // was cleared will not be returned to the pool when + // closed (and are closed instead) + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn1), "#3"); + + SqlConnection conn4 = new SqlConnection (connectionString); + conn4.Open (); + + SqlConnection conn5 = new SqlConnection (connectionString); + conn5.Open (); + + SqlConnection conn6 = new SqlConnection (connectionString); + conn6.Open (); + + Assert.AreEqual (initial_connection_count + 3, GetConnectionCount (conn1), "#4"); + + conn5.Close (); + conn6.Close (); + + // check if new connections are stored in the pool again + Assert.AreEqual (initial_connection_count + 3, GetConnectionCount (conn1), "#5"); + + conn1.Close (); + + Assert.AreEqual (initial_connection_count + 2, GetConnectionCount (conn4), "#6"); + + SqlConnection.ClearPool (conn3); + + // the connection passed to ClearPool does not have to + // be open + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn4), "#7"); + + SqlConnection conn7 = new SqlConnection (connectionString); + conn7.Open (); + conn7.Close (); + + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn4), "#8"); + + conn3.ConnectionString += ";App=B"; + SqlConnection.ClearPool (conn3); + + // check if a pool is identified by its connection string + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn4), "#9"); + + SqlConnection conn8 = new SqlConnection (connectionString); + SqlConnection.ClearPool (conn8); + + // connection should not have been opened before to + // clear the corresponding pool + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn4), "#10"); + + SqlConnection conn9 = new SqlConnection (connectionString); + conn9.Open (); + conn9.Close (); + + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn4), "#11"); + + conn3.ConnectionString = connectionString; + SqlConnection.ClearPool (conn3); + + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn4), "#12"); + + SqlConnection conn10 = new SqlConnection (connectionString); + conn10.Open (); + + SqlConnection conn11 = new SqlConnection (connectionString + ";App=B"); + conn11.Open (); + + SqlConnection conn12 = new SqlConnection (connectionString + ";App=B"); + conn12.Open (); + + SqlConnection conn13 = new SqlConnection (connectionString + ";App=B"); + conn13.Open (); + + conn10.Close (); + conn11.Close (); + conn12.Close (); + conn13.Close (); + + Assert.AreEqual (initial_connection_count + 4, GetConnectionCount (conn4), "#13"); + + // check that other connection pools are not affected + SqlConnection.ClearPool (conn13); + + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn4), "#14"); + + SqlConnection conn14 = new SqlConnection (connectionString); + conn14.Open (); + conn14.Dispose (); + + // a disposed connection cannot be used to clear a pool + SqlConnection.ClearPool (conn14); + + Assert.AreEqual (initial_connection_count + 1, GetConnectionCount (conn4), "#15"); + + SqlConnection.ClearPool (conn4); + + Assert.AreEqual (initial_connection_count, GetConnectionCount (conn4), "#16"); + + conn4.Close (); + } + + [Test] + public void InterfaceTransactionTest () + { + conn = new SqlConnection (connectionString); + conn.Open (); + IDbCommand idbCommand = new SqlCommand ("use [mono-test]", conn); + idbCommand.Connection = null; + Assert.AreEqual (null, idbCommand.Connection, "Connection should be null"); + idbCommand.Transaction = null; + Assert.AreEqual (null, idbCommand.Transaction, "Transaction should be null"); + + conn.Close (); + } + + [Test] + public void BeginTransaction () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + SqlTransaction trans = conn.BeginTransaction (); + Assert.AreSame (conn, trans.Connection, "#A1"); + Assert.AreEqual (IsolationLevel.ReadCommitted, trans.IsolationLevel, "#A2"); + trans.Rollback (); + + trans = conn.BeginTransaction (); + + try { + conn.BeginTransaction (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // SqlConnection does not support parallel transactions + Assert.AreEqual (typeof(InvalidOperationException), ex.GetType(), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } finally { + trans.Rollback(); + } + + try { + trans = conn.BeginTransaction (); + trans.Rollback (); + trans = conn.BeginTransaction (); + trans.Commit (); + trans = conn.BeginTransaction (); + } finally { + trans.Rollback (); + } + } + + [Test] + public void ConnectionString () + { + conn = new SqlConnection (connectionString); + // Test Repeated Keyoword should take the latest value + conn.ConnectionString = conn.ConnectionString + ";server=RepeatedServer;"; + Assert.AreEqual ("RepeatedServer", ((SqlConnection)conn).DataSource, "#A1"); + conn.ConnectionString += ";database=gen;Initial Catalog=gen1"; + Assert.AreEqual ("gen1", conn.Database, "#A2"); + + // Test if properties are set correctly + string str = "server=localhost1;database=db;user id=user;"; + str += "password=pwd;Workstation ID=workstation;Packet Size=512;"; + str += "Connect Timeout=10"; + conn.ConnectionString = str; + + Assert.AreEqual ("localhost1", conn.DataSource, "#B1"); + Assert.AreEqual ("db", conn.Database, "#B2"); + Assert.AreEqual (ConnectionState.Closed, conn.State, "#B3"); + Assert.AreEqual ("workstation", conn.WorkstationId, "#B4"); + Assert.AreEqual (512, conn.PacketSize, "#B5"); + Assert.AreEqual (10, conn.ConnectionTimeout, "#B6"); + + // Test if any leftover values exist from previous invocation + conn.ConnectionString = connectionString; + conn.ConnectionString = string.Empty; + Assert.AreEqual (string.Empty, conn.DataSource, "#C1"); + Assert.AreEqual ("", conn.Database, "#C2"); + Assert.AreEqual (8000, conn.PacketSize, "#C3"); + Assert.AreEqual (15, conn.ConnectionTimeout, "#C4"); + Assert.IsTrue (string.Compare (conn.WorkstationId, Environment.MachineName, true) == 0, "#C5"); + } + + [Test] + public void ConnectionString_Connection_Open () + { + conn = new SqlConnection (connectionString); + conn.ConnectionString = connectionString; + conn.Open (); + try { + conn.ConnectionString = "server=localhost;database=tmp;"; + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // Not allowed to change the 'ConnectionString' + // property. The connection's current state is open + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } finally { + conn.Close (); + } + } + + [Test] + public void ServerVersionTest () + { + conn = new SqlConnection (connectionString); + + // Test InvalidOperation Exception is thrown if Connection is CLOSED + try { + string s = conn.ServerVersion; + Assert.Fail ("#A1:" + s); + } catch (InvalidOperationException ex) { + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + // Test if Release Version is as per specification. + conn.Open (); + String [] version = conn.ServerVersion.Split ('.'); + Assert.AreEqual (2, version[0].Length, + "#B1 The Major release shud be exactly 2 characters"); + Assert.AreEqual (2, version[1].Length, + "#B2 The Minor release shud be exactly 2 characters"); + Assert.AreEqual (4, version[2].Length, + "#B3 The Release version should be exactly 4 digits"); + } + + [Test] + public void Database () + { + conn = new SqlConnection (connectionString); + string database = conn.Database; + + SqlCommand cmd; + + // Test if database property is updated when a query changes database + conn.Open (); + cmd = new SqlCommand ("use [master]" , conn); + cmd.ExecuteNonQuery (); + Assert.AreEqual ("master", conn.Database, "#1"); + + // ensure we're really in the expected database + if (ClientVersion == 7) + cmd.CommandText = "SELECT name FROM sysdatabases WHERE name = 'master'"; + else + cmd.CommandText = "SELECT name FROM sys.databases WHERE name = 'master'"; + using (SqlDataReader dr = cmd.ExecuteReader ()) { + Assert.IsTrue (dr.Read (), "#2"); + } + + conn.Close (); + Assert.AreEqual (database, conn.Database, "#3"); + + // Test if the database property is reset on re-opening the connection + conn.ConnectionString = connectionString; + conn.Open (); + Assert.AreEqual (database, conn.Database, "#4"); + + // ensure we're really in the expected database + cmd.CommandText = "SELECT fname FROM employee WHERE id = 2"; + using (SqlDataReader dr = cmd.ExecuteReader ()) { + Assert.IsTrue (dr.Read (), "#5"); + Assert.AreEqual ("ramesh", dr.GetValue (0), "#6"); + } + + conn.Close (); + } + + [Test] // bug #412571 + public void Dispose () + { + StateChangeEventArgs stateChangeArgs; + EventArgs disposedArgs; + + conn = new SqlConnection (connectionString + ";Connection Timeout=30;Packet Size=512;Workstation Id=Desktop"); + conn.Disposed += new EventHandler (Connection_Disposed); + conn.Open (); + conn.StateChange += new StateChangeEventHandler (Connection_StateChange); + Assert.AreEqual (0, events.Count, "#A1"); + conn.Dispose (); + Assert.AreEqual (string.Empty, conn.ConnectionString, "#A2"); + Assert.AreEqual (15, conn.ConnectionTimeout, "#A3"); + Assert.AreEqual (string.Empty, conn.Database, "#A4"); + Assert.AreEqual (string.Empty, conn.DataSource, "#A5"); + Assert.AreEqual (8000, conn.PacketSize, "#A6"); + Assert.AreEqual (ConnectionState.Closed, conn.State, "#A7"); + Assert.IsTrue (string.Compare (conn.WorkstationId, Environment.MachineName, true) == 0, "#A8"); + Assert.AreEqual (2, events.Count, "#A9"); + + stateChangeArgs = events [0] as StateChangeEventArgs; + Assert.IsNotNull (stateChangeArgs, "#B1"); + Assert.AreEqual (typeof (StateChangeEventArgs), stateChangeArgs.GetType (), "#B2"); + Assert.AreEqual (ConnectionState.Open, stateChangeArgs.OriginalState, "#B3"); + Assert.AreEqual (ConnectionState.Closed, stateChangeArgs.CurrentState, "B4"); + + disposedArgs = events [1] as EventArgs; + Assert.IsNotNull (disposedArgs, "#C1"); + Assert.AreEqual (typeof (EventArgs), disposedArgs.GetType (), "#C2"); + + conn.Dispose (); + + Assert.AreEqual (ConnectionState.Closed, conn.State, "#D1"); + Assert.AreEqual (3, events.Count, "#D2"); + + disposedArgs = events [2] as EventArgs; + Assert.IsNotNull (disposedArgs, "#E1"); + Assert.AreEqual (typeof (EventArgs), disposedArgs.GetType (), "#E2"); + } + + void Connection_StateChange (object sender , StateChangeEventArgs e) + { + events.Add (e); + } + + void Connection_Disposed (object sender , EventArgs e) + { + events.Add (e); + } + + [Test] + public void FireInfoMessageEventOnUserErrorsTest () + { + conn = new SqlConnection (); + Assert.AreEqual(false, conn.FireInfoMessageEventOnUserErrors, "#1 The default value should be false"); + conn.FireInfoMessageEventOnUserErrors = true; + Assert.AreEqual(true, conn.FireInfoMessageEventOnUserErrors, "#1 The value should be true after setting the property to true"); + } + + [Test] + public void StatisticsEnabledTest () + { + conn = new SqlConnection (); + Assert.AreEqual(false, conn.StatisticsEnabled, "#1 The default value should be false"); + conn.StatisticsEnabled = true; + Assert.AreEqual(true, conn.StatisticsEnabled, "#1 The value should be true after setting the property to true"); + } + + [Test] + [Category("NotWorking")] + public void ChangePasswordTest () + { + string tmpPassword = "modifiedbymonosqlclient"; + SqlConnection.ChangePassword (connectionString, tmpPassword); + SqlConnectionStringBuilder connBuilder = new SqlConnectionStringBuilder (connectionString); + string oldPassword = connBuilder.Password; + connBuilder.Password = tmpPassword; + SqlConnection.ChangePassword (connBuilder.ConnectionString, oldPassword); // Modify to the original password + } + + static int GetConnectionCount (SqlConnection conn) + { + Thread.Sleep (200); + + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = "select count(*) from master..sysprocesses where db_name(dbid) = @dbname"; + cmd.Parameters.Add (new SqlParameter ("@dbname", conn.Database)); + int connection_count = (int) cmd.ExecuteScalar (); + cmd.Dispose (); + + return connection_count; + } + + int ClientVersion { + get { + return (engine.ClientVersion); + } + } + } + + [TestFixture] + [Category ("sqlserver")] + public class GetSchemaTest + { + SqlConnection conn = null; + String connectionString = ConnectionManager.Instance.Sql.ConnectionString; + + [SetUp] + public void SetUp() + { + conn = new SqlConnection(connectionString); + conn.Open(); + } + + [TearDown] + public void TearDown() + { + conn?.Close(); + } + + [Test] + public void GetSchemaTest1() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("databases"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + if (col.ColumnName.ToString() == "database_name" && row[col].ToString() == ConnectionManager.Instance.DatabaseName) + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS1 failed"); + } + + [Test] + [ExpectedException(typeof(ArgumentException))] + public void GetSchemaTest2() + { + conn.GetSchema(null); + } + + [Test] + public void GetSchemaTest3 () + { + Assert.Ignore ("We currently have no foreign keys defined in the test database"); + + bool flag = false; + DataTable tab1 = conn.GetSchema("ForeignKeys"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "TABLE_NAME" && row[col].ToString() == "tmptable1") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS3 failed"); + } + + [Test] + public void GetSchemaTest4() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("Indexes"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "table_name" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS4 failed"); + } + + [Test] + public void GetSchemaTest5() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("IndexColumns"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "table_name" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS5 failed"); + } + + [Test] + public void GetSchemaTest6() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("Procedures"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "SPECIFIC_NAME" && row[col].ToString() == "sp_get_age") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS6 failed"); + } + + [Test] + public void GetSchemaTest7() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("ProcedureParameters"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "SPECIFIC_NAME" && row[col].ToString() == "sp_get_age") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS7 failed"); + } + + [Test] + public void GetSchemaTest8() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("Tables"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "TABLE_NAME" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS8 failed"); + } + + [Test] + public void GetSchemaTest9() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("Columns"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "TABLE_NAME" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS9 failed"); + } + + [Test] + public void GetSchemaTest10() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("Users"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "user_name" && row[col].ToString() == "public") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS10 failed"); + } + + [Test] + public void GetSchemaTest11 () + { + Assert.Ignore ("Incorrect syntax near 'TABLE_SCHEMA'"); + + bool flag = false; + DataTable tab1 = conn.GetSchema("Views"); + flag = true; // FIXME: Currently MS-SQL 2005 returns empty table. Remove this flag ASAP. + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values. + */ + if (col.ColumnName.ToString() == "user_name" && row[col].ToString() == "public") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS11 failed"); + } + + [Test] + public void GetSchemaTest12 () + { + Assert.Ignore ("Incorrect syntax near '('"); + + bool flag = false; + DataTable tab1 = conn.GetSchema("ViewColumns"); + flag = true; // FIXME: Currently MS-SQL 2005 returns empty table. Remove this flag ASAP. + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values. + */ + if (col.ColumnName.ToString() == "user_name" && row[col].ToString() == "public") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS12 failed"); + } + + [Test] + public void GetSchemaTest13 () + { + Assert.Ignore ("The multi-part identifier \"assportemblies.name\" could not be bound"); + + bool flag = false; + DataTable tab1 = conn.GetSchema("UserDefinedTypes"); + flag = true; // FIXME: Currently MS-SQL 2005 returns empty table. Remove this flag ASAP. + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values. + */ + if (col.ColumnName.ToString() == "user_name" && row[col].ToString() == "public") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS13 failed"); + } + + [Test] + [Ignore("TODO: fix restrictions")] + public void GetSchemaTest14() + { + bool flag = false; + string [] restrictions = new string[4]; + + restrictions[0] = ConnectionManager.Instance.DatabaseName; + restrictions[1] = "dbo"; + restrictions[2] = null; + restrictions[3] = "BASE TABLE"; + DataTable tab1 = conn.GetSchema("Tables", restrictions); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "TABLE_NAME" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS14 failed"); + } + + [Test] + [Ignore("TODO: fix restrictions")] + public void GetSchemaTest15() + { + bool flag = false; + string [] restrictions = new string[4]; + + restrictions[0] = ConnectionManager.Instance.DatabaseName; + restrictions[1] = null; + restrictions[2] = "binary_family"; + restrictions[3] = null; + DataTable tab1 = conn.GetSchema("IndexColumns", restrictions); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "table_name" && row[col].ToString() == "binary_family") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS15 failed"); + } + + [Test] + [Ignore("TODO: fix restrictions")] + public void GetSchemaTest16() + { + bool flag = false; + string [] restrictions = new string[4]; + + restrictions[0] = ConnectionManager.Instance.DatabaseName; + restrictions[1] = null; + restrictions[2] = "sp_get_age"; + restrictions[3] = null; + DataTable tab1 = conn.GetSchema("Procedures", restrictions); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "ROUTINE_NAME" && row[col].ToString() == "sp_get_age") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS16 failed"); + } + + [Test] + public void GetSchemaTest17() + { + bool flag = false; + DataTable tab1 = conn.GetSchema(); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "CollectionName" && row[col].ToString() == "UserDefinedTypes") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS17 failed"); + } + + [Test] + public void GetSchemaTest18() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("RESTRICTIONS"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "RestrictionDefault" && row[col].ToString() == "CONSTRAINT_NAME") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS18 failed"); + } + + [Test] + [ExpectedException (typeof (ArgumentException))] + public void GetSchemaTest19 () + { + String [] restrictions = new String[1]; + conn.GetSchema("RESTRICTIONS", restrictions); + } + + [Test] + public void GetSchemaTest20 () + { + bool flag = false; + DataTable tab1 = conn.GetSchema("DataTypes"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "TypeName" && row[col].ToString() == "uniqueidentifier") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS20 failed"); + } + + [Test] + public void GetSchemaTest21() + { + bool flag = false; + DataTable tab1 = conn.GetSchema(); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "CollectionName" && row[col].ToString() == "UserDefinedTypes") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS21 failed"); + } + [Test] + public void GetSchemaTest22() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("ReservedWords"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "ReservedWord" && row[col].ToString() == "UPPER") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(true, flag, "#GS22 failed"); + } + + [Test] + public void GetSchemaTest23() + { + bool flag = false; + DataTable tab1 = conn.GetSchema("ReservedWords"); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "ReservedWord" && row[col].ToString() == "upper") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(false, flag, "#GS23 failed"); + } + + [Test] + public void GetSchemaTest24() + { + bool flag = false; + string [] restrictions = new string[4]; + + restrictions[0] = ConnectionManager.Instance.DatabaseName; + restrictions[1] = null; + restrictions[2] = "sp_get_age"; + restrictions[3] = null; + DataTable tab1 = conn.GetSchema("Procedures", restrictions); + foreach (DataRow row in tab1.Rows) + { + foreach (DataColumn col in tab1.Columns) + { + /* + * We need to consider multiple values + */ + if (col.ColumnName.ToString() == "ROUTINE_NAME" && row[col].ToString() == "mono") + { + flag = true; + break; + } + } + if (flag) + break; + } + Assert.AreEqual(false, flag, "#GS24 failed"); + } + + [Test] + [ExpectedException (typeof (ArgumentException))] + public void GetSchemaTest25 () + { + String [] restrictions = new String [1]; + conn.GetSchema ("Mono", restrictions); + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs new file mode 100644 index 0000000000..0c109b29b9 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs @@ -0,0 +1,1121 @@ +// +// SqlDataAdapterTest.cs - NUnit Test Cases for testing the +// SqlDataAdapter class +// Author: +// Umadevi S (sumadevi@novell.com) +// Sureshkumar T (tsureshkumar@novell.com) +// Senganal T (tsenganal@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; +using System.Configuration; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlDataAdapterTest + { + SqlDataAdapter adapter; + SqlDataReader dr; + DataSet data; + string connectionString = ConnectionManager.Instance.Sql.ConnectionString; + SqlConnection conn; + EngineConfig engine; + + [SetUp] + public void SetUp () + { + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [TearDown] + public void TearDown () + { + if (adapter != null) { + adapter.Dispose (); + adapter = null; + } + + if (dr != null) { + dr.Close (); + dr = null; + } + + if (conn != null) { + conn.Close (); + conn = null; + } + } + + [Test] + [Category("NotWorking")] + public void Update_DeleteRow () + { + conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString); + conn.Open (); + + DataTable dt = new DataTable (); + adapter = new SqlDataAdapter ("SELECT * FROM employee", conn); + SqlCommandBuilder builder = new SqlCommandBuilder (adapter); + adapter.DeleteCommand = builder.GetDeleteCommand (); + adapter.Fill (dt); + + DateTime now = DateTime.Now; + + DateTime doj = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + + DateTime dob = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + dob.Subtract (new TimeSpan (20 * 365, 0, 0, 0)); + + try { + DataRow newRow = dt.NewRow (); + newRow ["id"] = 6002; + newRow ["fname"] = "boston"; + newRow ["dob"] = dob; + newRow ["doj"] = doj; + newRow ["email"] = "mono@novell.com"; + dt.Rows.Add (newRow); + adapter.Update (dt); + + foreach (DataRow row in dt.Rows) + if (((int) row ["id"]) == 6002) + row.Delete (); + adapter.Update (dt); + + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT id, fname, lname, dob, doj, email FROM employee WHERE id = 6002"; + dr = cmd.ExecuteReader (); + Assert.IsFalse (dr.Read ()); + dr.Close (); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + [Category("NotWorking")] + public void Update_InsertRow () + { + conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString); + conn.Open (); + + DataTable dt = new DataTable (); + adapter = new SqlDataAdapter ("SELECT * FROM employee", conn); + + SqlCommandBuilder builder = new SqlCommandBuilder (adapter); + adapter.InsertCommand = builder.GetInsertCommand (); + adapter.Fill (dt); + + DateTime now = DateTime.Now; + + DateTime doj = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + + DateTime dob = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + dob.Subtract (new TimeSpan (20 * 365, 0, 0, 0)); + + try { + DataRow newRow = dt.NewRow (); + newRow ["id"] = 6002; + newRow ["fname"] = "boston"; + newRow ["dob"] = dob; + newRow ["doj"] = doj; + newRow ["email"] = "mono@novell.com"; + dt.Rows.Add (newRow); + adapter.Update (dt); + + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT id, fname, lname, dob, doj, email FROM employee WHERE id = 6002"; + dr = cmd.ExecuteReader (); + Assert.IsTrue (dr.Read (), "#A1"); + Assert.AreEqual (6002, dr.GetValue (0), "#A2"); + Assert.AreEqual ("boston", dr.GetValue (1), "#A3"); + Assert.AreEqual (DBNull.Value, dr.GetValue (2), "#A4"); + Assert.AreEqual (dob, dr.GetValue (3), "#A5"); + Assert.AreEqual (doj, dr.GetValue (4), "#A6"); + Assert.AreEqual ("mono@novell.com", dr.GetValue (5), "#A7"); + Assert.IsFalse (dr.Read (), "#A8"); + dr.Close (); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + [Category("NotWorking")] + public void Update_UpdateRow () + { + conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString); + conn.Open (); + + DataTable dt = new DataTable (); + adapter = new SqlDataAdapter ("SELECT * FROM employee", conn); + SqlCommandBuilder builder = new SqlCommandBuilder (adapter); + adapter.UpdateCommand = builder.GetUpdateCommand (); + adapter.Fill (dt); + + DateTime now = DateTime.Now; + + DateTime doj = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + + DateTime dob = new DateTime (now.Year, now.Month, now.Day, now.Hour, + now.Minute, now.Second); + dob.Subtract (new TimeSpan (20 * 365, 0, 0, 0)); + + try { + DataRow newRow = dt.NewRow (); + newRow ["id"] = 6002; + newRow ["fname"] = "boston"; + newRow ["dob"] = dob; + newRow ["doj"] = doj; + newRow ["email"] = "mono@novell.com"; + dt.Rows.Add (newRow); + adapter.Update (dt); + + foreach (DataRow row in dt.Rows) + if (((int) row ["id"]) == 6002) + row ["lname"] = "de Icaza"; + adapter.Update (dt); + + SqlCommand cmd = conn.CreateCommand (); + cmd.CommandText = "SELECT id, fname, lname, dob, doj, email FROM employee WHERE id = 6002"; + dr = cmd.ExecuteReader (); + Assert.IsTrue (dr.Read (), "#A1"); + Assert.AreEqual (6002, dr.GetValue (0), "#A2"); + Assert.AreEqual ("boston", dr.GetValue (1), "#A3"); + Assert.AreEqual ("de Icaza", dr.GetValue (2), "#A4"); + Assert.AreEqual (dob, dr.GetValue (3), "#A5"); + Assert.AreEqual (doj, dr.GetValue (4), "#A6"); + Assert.AreEqual ("mono@novell.com", dr.GetValue (5), "#A7"); + Assert.IsFalse (dr.Read (), "#A8"); + dr.Close (); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + /** + The below test will not run everytime, since the region id column is unique + so change the regionid if you want the test to pass. + **/ + /* + [Test] + public void UpdateTest () { + conn = (SqlConnection) ConnectionManager.Singleton.Connection; + try { + ConnectionManager.Singleton.OpenConnection (); + DataTable dt = new DataTable(); + SqlDataAdapter da = null; + da = new SqlDataAdapter("Select * from employee", conn); + //SqlCommandBuilder cb = new SqlCommandBuilder (da); + da.Fill(dt); + DataRow dr = dt.NewRow(); + dr ["id"] = 6002; + dr ["fname"] = "boston"; + dr ["dob"] = DateTime.Now.Subtract (new TimeSpan (20*365, 0, 0, 0)); + dr ["doj"] = DateTime.Now; + dt.Rows.Add(dr); + + da.Update(dt); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + ConnectionManager.Singleton.Sql.CloseConnection (); + } + } + + private static void OnRowUpdatedTest (object sender, SqlRowUpdatedEventArgs e) + { + rowUpdated = true; + } + + private static void OnRowUpdatingTest (object sender, SqlRowUpdatingEventArgs e) + { + rowUpdating = true; + } + + private static bool rowUpdated = false; + private static bool rowUpdating = false; + [Test] + public void RowUpdatedTest () { + conn = (SqlConnection) ConnectionManager.Singleton.Connection; + try { + ConnectionManager.Singleton.OpenConnection (); + DataTable dt = null; + DataSet ds = new DataSet (); + SqlDataAdapter da = null; + da = new SqlDataAdapter("Select * from employee", conn); + //SqlCommandBuilder cb = new SqlCommandBuilder (da); + rowUpdated = false; + rowUpdating = false; + da.RowUpdated += new SqlRowUpdatedEventHandler (OnRowUpdatedTest); + da.RowUpdating += new SqlRowUpdatingEventHandler (OnRowUpdatingTest); + da.Fill (ds); + dt = ds.Tables [0]; + dt.Rows[0][0] = 200; + da.UpdateCommand = new SqlCommand ("Update employee set id = @id"); + da.Update (dt); + dt.Rows[0][0] = 1; + da.Update (dt); + da.RowUpdated -= new SqlRowUpdatedEventHandler (OnRowUpdatedTest); + da.RowUpdating -= new SqlRowUpdatingEventHandler (OnRowUpdatingTest); + Assert.AreEqual (true, rowUpdated, "RowUpdated"); + Assert.AreEqual (true, rowUpdating, "RowUpdating"); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + ConnectionManager.Singleton.Sql.CloseConnection (); + } + } + */ + + /** + This needs a errortable created as follows + id uniqueidentifier,name char(10) , with values + Guid name + {A12...} NULL + NULL bbbbbb + **/ + [Test] + public void NullGuidTest() + { + conn = ConnectionManager.Instance.Sql.Connection; + try { + DBHelper.ExecuteNonQuery (conn, "create table #tmp_guid_table ( " + + " id uniqueidentifier default newid (), " + + " name char (10))"); + DBHelper.ExecuteNonQuery (conn, "insert into #tmp_guid_table (name) values (null)"); + DBHelper.ExecuteNonQuery (conn, "insert into #tmp_guid_table (id, name) values (null, 'bbbb')"); + SqlDataAdapter da = new SqlDataAdapter("select * from #tmp_guid_table", conn); + DataSet ds = new DataSet(); + da.Fill(ds); + Assert.AreEqual (1, ds.Tables.Count, "#1"); + Assert.AreEqual (DBNull.Value, ds.Tables [0].Rows [1] ["id"], "#2"); + } finally { + ConnectionManager.Instance.Sql.CloseConnection (); + } + // the bug 68804 - is that the fill hangs! + Assert.AreEqual("Done","Done"); + } + + [Test] + public void DefaultConstructorTest () + { + adapter = new SqlDataAdapter (); + Assert.AreEqual (MissingMappingAction.Passthrough, + adapter.MissingMappingAction, + "#1 Missing Mapping acttion default to Passthrough"); + Assert.AreEqual (MissingSchemaAction.Add, + adapter.MissingSchemaAction, + "#2 Missing Schme action default to Add"); + } + + [Test] + public void OverloadedConstructorsTest () + { + SqlCommand selCmd = new SqlCommand ("Select * from numeric_family"); + adapter = new SqlDataAdapter (selCmd); + Assert.AreEqual (MissingMappingAction.Passthrough, + adapter.MissingMappingAction, + "#1 Missing Mapping acttion default to Passthrough"); + Assert.AreEqual (MissingSchemaAction.Add, + adapter.MissingSchemaAction, + "#2 Missing Schme action default to Add"); + Assert.AreSame (selCmd, adapter.SelectCommand, + "#3 Select Command shud be a ref to the arg passed"); + + conn = new SqlConnection (connectionString); + String selStr = "Select * from numeric_family"; + adapter = new SqlDataAdapter (selStr, conn); + Assert.AreEqual (MissingMappingAction.Passthrough, + adapter.MissingMappingAction, + "#4 Missing Mapping acttion default to Passthrough"); + Assert.AreEqual (MissingSchemaAction.Add, + adapter.MissingSchemaAction, + "#5 Missing Schme action default to Add"); + Assert.AreSame (selStr, adapter.SelectCommand.CommandText, + "#6 Select Command shud be a ref to the arg passed"); + Assert.AreSame (conn, adapter.SelectCommand.Connection, + "#7 cmd.connection shud be t ref to connection obj"); + + selStr = "Select * from numeric_family"; + adapter = new SqlDataAdapter (selStr, connectionString); + Assert.AreEqual (MissingMappingAction.Passthrough, + adapter.MissingMappingAction, + "#8 Missing Mapping action shud default to Passthrough"); + Assert.AreEqual (MissingSchemaAction.Add, + adapter.MissingSchemaAction, + "#9 Missing Schema action shud default to Add"); + Assert.AreSame (selStr, + adapter.SelectCommand.CommandText, + "#10"); + Assert.AreEqual (connectionString, + adapter.SelectCommand.Connection.ConnectionString, + "#11 "); + } + + [Test] + public void Fill_Test_ConnState () + { + //Check if Connection State is maintained correctly .. + data = new DataSet ("test1"); + adapter = new SqlDataAdapter ("select id from numeric_family where id=1", + connectionString); + SqlCommand cmd = adapter.SelectCommand ; + + Assert.AreEqual (ConnectionState.Closed, + cmd.Connection.State, "#1 Connection shud be in closed state"); + adapter.Fill (data); + Assert.AreEqual (1, data.Tables.Count, "#2 One table shud be populated"); + Assert.AreEqual (ConnectionState.Closed, cmd.Connection.State, + "#3 Connection shud be closed state"); + + data = new DataSet ("test2"); + cmd.Connection.Open (); + Assert.AreEqual (ConnectionState.Open, cmd.Connection.State, + "#3 Connection shud be open"); + adapter.Fill (data); + Assert.AreEqual (1, data.Tables.Count, "#4 One table shud be populated"); + Assert.AreEqual (ConnectionState.Open, cmd.Connection.State, + "#5 Connection shud be open"); + cmd.Connection.Close (); + + // Test if connection is closed when exception occurs + cmd.CommandText = "select id1 from numeric_family"; + try { + adapter.Fill (data); + } catch { + if (cmd.Connection.State == ConnectionState.Open) { + cmd.Connection.Close (); + Assert.Fail ("# Connection Shud be Closed"); + } + } + } + + [Test] + [Category("NotWorking")] + public void Fill_Test_Data () + { + //Check if a table is created for each resultset + String batchQuery = "Select id,type_bit,type_int from numeric_family;"; + batchQuery += "Select type_bit from numeric_family"; + adapter = new SqlDataAdapter (batchQuery, connectionString); + data = new DataSet ("test1"); + adapter.Fill (data); + Assert.AreEqual (2, data.Tables.Count,"#1 2 Table shud be created"); + + //Check if Table and Col are named correctly for unnamed columns + string query = "Select 10,20 from numeric_family;" ; + query += "Select 10,20 from numeric_family"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test2"); + adapter.Fill (data); + Assert.AreEqual (2, data.Tables.Count, + "#2 2 Tables shud be created"); + Assert.AreEqual ("Table", data.Tables[0].TableName, "#3"); + Assert.AreEqual ("Table1", data.Tables[1].TableName, "#4"); + Assert.AreEqual ("Column1", data.Tables[0].Columns[0].ColumnName, "#5"); + Assert.AreEqual ("Column2", data.Tables[0].Columns[1].ColumnName, "#6"); + Assert.AreEqual ("Column1", data.Tables[1].Columns[0].ColumnName, "#7"); + Assert.AreEqual ("Column2", data.Tables[1].Columns[1].ColumnName, "#8"); + + //Check if dup columns are named correctly + query = "select A.id ,B.id , C.id from numeric_family A, "; + query += "numeric_family B , numeric_family C"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test3"); + adapter.Fill (data); + + // NOTE msdotnet contradicts documented behavior + // as per documentation the column names should be + // id1,id2,id3 .. but msdotnet returns id,id1,id2 + Assert.AreEqual ("id", data.Tables[0].Columns[0].ColumnName, + "#9 if colname is duplicated ,shud be col,col1,col2 etc"); + Assert.AreEqual ("id1", data.Tables[0].Columns[1].ColumnName, + "#10 if colname is duplicated ,shud be col,col1,col2 etc"); + Assert.AreEqual ("id2", data.Tables[0].Columns[2].ColumnName, + "#11 if colname is duplicated ,shud be col,col1,col2 etc"); + + // Test if tables are created and named accordingly , + // but only for those queries returning result sets + query = "update numeric_family set id=100 where id=50;"; + query += "select * from numeric_family"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test4"); + adapter.Fill (data); + Assert.AreEqual (1 ,data.Tables.Count, + "#12 Tables shud be named only for queries returning a resultset"); + Assert.AreEqual ("Table", data.Tables[0].TableName, + "#13 The first resutlset shud have 'Table' as its name"); + + // Test behavior with an outerjoin + query = "select A.id,B.type_bit from numeric_family A LEFT OUTER JOIN "; + query += "numeric_family B on A.id = B.type_bit"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test5"); + adapter.Fill (data); + Assert.AreEqual (0, data.Tables[0].PrimaryKey.Length, + "#14 Primary Key shudnt be set if an outer join is performed"); + Assert.AreEqual (0, data.Tables[0].Constraints.Count, + "#15 Constraints shudnt be set if an outer join is performed"); + adapter = new SqlDataAdapter ("select id from numeric_family", + connectionString); + data = new DataSet ("test6"); + adapter.Fill (data, 1, 1, "numeric_family"); + Assert.AreEqual (1, data.Tables[0].Rows.Count, "#16"); + Assert.AreEqual (2, data.Tables[0].Rows[0][0], "#17"); + + // only one test for DataTable.. DataSet tests covers others + adapter = new SqlDataAdapter ("select id from numeric_family", + connectionString); + DataTable table = new DataTable ("table1"); + adapter.Fill (table); + Assert.AreEqual (4, table.Rows.Count , "#18"); + } + + [Test] + public void Fill_Test_PriKey () + { + // Test if Primary Key & Constraints Collection is correct + adapter = new SqlDataAdapter ("select id,type_bit from numeric_family", + connectionString); + adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey; + data = new DataSet ("test1"); + adapter.Fill (data); + Assert.AreEqual (1, data.Tables[0].PrimaryKey.Length, + "#1 Primary Key shud be set"); + Assert.AreEqual (1, data.Tables[0].Constraints.Count, + "#2 Constraints shud be set"); + Assert.AreEqual (4, data.Tables[0].Rows.Count, + "#3 No Of Rows shud be 4"); + + // Test if data is correctly merged + adapter.Fill (data); + Assert.AreEqual (4, data.Tables[0].Rows.Count, + "#4 No of Row shud still be 4"); + + // Test if rows are appended and not merged + // when primary key is not returned in the result-set + string query = "Select type_int from numeric_family"; + adapter.SelectCommand.CommandText = query; + data = new DataSet ("test2"); + adapter.Fill (data); + Assert.AreEqual (4, data.Tables[0].Rows.Count, + "#5 No of Rows shud be 4"); + adapter.Fill (data); + Assert.AreEqual (8, data.Tables[0].Rows.Count, + "#6 No of Rows shud double now"); + } + + [Test] + public void Fill_Test_Exceptions () + { + adapter = new SqlDataAdapter ("select * from numeric_family", + connectionString); + data = new DataSet ("test1"); + try { + adapter.Fill (data, -1, 0, "numeric_family"); + Assert.Fail ("#1 Exception shud be thrown:Incorrect Arguments"); + }catch (AssertionException e){ + throw e; + }catch (Exception e){ + Assert.AreEqual (typeof(ArgumentException), e.GetType(), + "#2 Incorrect Exception : " + e); + } + + // conn is not closed due to a bug.. + // can be removed later + adapter.SelectCommand.Connection.Close (); + + try { + adapter.Fill (data , 0 , -1 , "numeric_family"); + Assert.Fail ("#3 Exception shud be thrown:Incorrect Arguments"); + }catch (AssertionException e){ + throw e; + }catch (Exception e){ + Assert.AreEqual (typeof(ArgumentException), e.GetType(), + "#4 Incorrect Exception : " + e); + } + // conn is curr not closed.. can be removed later + adapter.SelectCommand.Connection.Close (); + + /* + // NOTE msdotnet contradicts documented behavior + // InvalidOperationException is expected if table is not valid + try { + adapter.Fill (data , 0 , 0 , "invalid_talbe_name"); + }catch (InvalidOperationException e) { + ex= e; + }catch (Exception e){ + Assert.Fail ("#5 Exception shud be thrown : incorrect arugments "); + } + Assert.IsNotNull (ex , "#6 Exception shud be thrown : incorrect args "); + adapter.SelectCommand.Connection.Close (); // tmp .. can be removed once the bug if fixed + ex=null; + */ + + try { + adapter.Fill ( null , 0 , 0 , "numeric_family"); + Assert.Fail ( "#7 Exception shud be thrown : Invalid Dataset"); + }catch (AssertionException e){ + throw e ; + }catch (ArgumentNullException) { + + }catch (Exception e) { + Assert.AreEqual (typeof(SystemException), e.GetType(), + "#8 Incorrect Exception : " + e); + } + // conn is currently not being closed.. + //need to be removed once behavior is fixed + adapter.SelectCommand.Connection.Close (); + + adapter.SelectCommand.Connection = null; + try { + adapter.Fill (data); + Assert.Fail ("#9 Exception shud be thrown : Invalid Connection"); + }catch (AssertionException e){ + throw e; + }catch (Exception e){ + Assert.AreEqual (typeof(InvalidOperationException), e.GetType(), + "#10 Incorrect Exception : " + e); + } + } + + bool FillErrorContinue = false; + [Test] + public void Fill_Test_FillErrorTest () + { + string query = "select type_int from numeric_family where id=1 or id=4 "; + + DataSet ds = new DataSet (); + DataTable table = ds.Tables.Add ("test"); + table.Columns.Add ("col", typeof (short)); + + adapter = new SqlDataAdapter (query, connectionString); + DataTableMapping mapping = adapter.TableMappings.Add ("numeric_family", "test"); + mapping.ColumnMappings.Add ("type_int", "col"); + + try { + adapter.Fill (ds, "numeric_family"); + Assert.Fail ("#A1"); + } catch (OverflowException) { + } catch (ArgumentException ex) { + // System.OverflowException: Value was either too large or too + // small for an Int16 + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2"); + Assert.IsNotNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsNull (ex.ParamName, "#A5"); + + OverflowException inner = ex.InnerException as OverflowException; + Assert.IsNotNull (inner, "#A6"); + Assert.AreEqual (typeof (OverflowException), inner.GetType (), "#A7"); + Assert.IsNull (inner.InnerException, "#A8"); + Assert.IsNotNull (inner.Message, "#A9"); + } + Assert.AreEqual (0, ds.Tables [0].Rows.Count, "#A10"); + + adapter.FillError += new FillErrorEventHandler (ErrorHandler); + FillErrorContinue = false; + try { + adapter.Fill (ds, "numeric_family"); + Assert.Fail ("#B1"); + } catch (OverflowException) { + } catch (ArgumentException ex) { + // System.OverflowException: Value was either too large or too + // small for an Int16 + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2"); + Assert.IsNotNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + Assert.IsNull (ex.ParamName, "#B5"); + + OverflowException inner = ex.InnerException as OverflowException; + Assert.IsNotNull (inner, "#B6"); + Assert.AreEqual (typeof (OverflowException), inner.GetType (), "#B7"); + Assert.IsNull (inner.InnerException, "#B8"); + Assert.IsNotNull (inner.Message, "#B9"); + } + Assert.AreEqual (0, ds.Tables [0].Rows.Count, "#B10"); + + FillErrorContinue = true; + int count = adapter.Fill (ds, "numeric_family"); + Assert.AreEqual (1, ds.Tables [0].Rows.Count, "#C1"); + Assert.AreEqual (1, count, "#C2"); + } + + void ErrorHandler (object sender, FillErrorEventArgs args) + { + args.Continue = FillErrorContinue; + } + + [Test] + public void GetFillParametersTest () + { + string query = "select id, type_bit from numeric_family where id > @param1"; + adapter = new SqlDataAdapter (query, connectionString); + IDataParameter[] param = adapter.GetFillParameters (); + Assert.AreEqual (0, param.Length, "#1 size shud be 0"); + + SqlParameter param1 = new SqlParameter (); + param1.ParameterName = "@param1"; + param1.Value = 2; + adapter.SelectCommand.Parameters.Add (param1); + + param = adapter.GetFillParameters (); + Assert.AreEqual (1, param.Length, "#2 count shud be 1"); + Assert.AreEqual (param1, param[0], "#3 Params shud be equal"); + } + + [Test] + public void FillSchemaTest () + { + string query; + + // Test if connection is closed if excepton occurs during fill schema + query = "select * from invalid_table"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test"); + try { + adapter.FillSchema (data , SchemaType.Source); + } catch { + if (adapter.SelectCommand.Connection.State != ConnectionState.Closed) { + Assert.Fail ("#0 Conn shud be closed if exception occurs"); + adapter.SelectCommand.Connection.Close(); + } + } + + // Test Primary Key is set (since primary key column returned) + query = "select id, type_int from numeric_family where id=1"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test1"); + adapter.FillSchema (data , SchemaType.Source); + + Assert.AreEqual (1, data.Tables[0].PrimaryKey.Length, + "#1 Primary Key property must be set"); + + // Test Primary Key is not set (since primary key column is returned) + query = "select type_bit, type_int from numeric_family where id=1"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test2"); + adapter.FillSchema (data, SchemaType.Source); + Assert.AreEqual (0, data.Tables[0].PrimaryKey.Length, + "#2 Primary Key property should not be set"); + + // Test multiple tables are created for a batch query + query = "Select id ,type_bit from numeric_family;" ; + query += "Select id,type_bit,type_int from numeric_family;"; + data = new DataSet ("test3"); + adapter = new SqlDataAdapter (query, connectionString); + adapter.FillSchema (data , SchemaType.Source); + Assert.AreEqual (2 , data.Tables.Count , "#3 A table shud be created for each Result Set"); + Assert.AreEqual (2 , data.Tables[0].Columns.Count , "#4 should have 2 columns"); + Assert.AreEqual (3 , data.Tables[1].Columns.Count , "#5 Should have 3 columns"); + + // Test if table names and column names are filled correctly + query = "select 10,20 from numeric_family;" ; + query += "select 10,20 from numeric_family;"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test4"); + try { + adapter.FillSchema (data , SchemaType.Source); + }catch (Exception e){ + Assert.Fail ("#3 Unexpected Exception : " + e); + } + Assert.AreEqual ( "Table", data.Tables[0].TableName); + Assert.AreEqual ( "Table1", data.Tables[1].TableName); + Assert.AreEqual ( "Column1", data.Tables[0].Columns[0].ColumnName, + "#6 Unnamed col shud be named as 'ColumnN'"); + Assert.AreEqual ( "Column2", data.Tables[0].Columns[1].ColumnName, + "#7 Unnamed col shud be named as 'ColumnN'"); + Assert.AreEqual ( "Column1", data.Tables[1].Columns[0].ColumnName, + "#8 Unnamed col shud be named as 'ColumnN'"); + Assert.AreEqual ( "Column2", data.Tables[1].Columns[1].ColumnName, + "#9 Unnamed col shud be named as 'ColumnN'"); + Assert.AreEqual (ConnectionState.Closed, adapter.SelectCommand.Connection.State, + "#10 Connection shud be closed"); + + // Test if mapping works correctly + // doesent work in both mono and msdotnet + // gotto check if something is wrong + /* + query = "select id,type_bit from numeric_family"; + adapter = new SqlDataAdapter (query, connectionString); + data = new DataSet ("test"); + DataTable table = data.Tables.Add ("numeric_family_1"); + table.Columns.Add ("id"); + table.Columns.Add ("type_bit"); + DataTableMapping map = adapter.TableMappings.Add("numeric_family_1", + "numeric_family"); + map.ColumnMappings.Add ("id", "id_1"); + map.ColumnMappings.Add ("type_bit", "type_bit_1"); + adapter.FillSchema (data, SchemaType.Source, "numeric_family"); + foreach (DataTable tab in data.Tables){ + Console.WriteLine ("Table == {0}",tab.TableName); + foreach (DataColumn col in tab.Columns) + Console.WriteLine (" Col = {0} " , col.ColumnName); + } + */ + } + + [Test] + [Category("NotWorking")] + public void MissingSchemaActionTest () + { + adapter = new SqlDataAdapter ( + "select id,type_bit,type_int from numeric_family where id<=4", + connectionString); + data = new DataSet (); + Assert.AreEqual (MissingSchemaAction.Add, adapter.MissingSchemaAction, + "#1 Default Value"); + + adapter.Fill (data); + Assert.AreEqual (1, data.Tables.Count , "#1 One table shud be populated"); + Assert.AreEqual (3, data.Tables[0].Columns.Count, "#2 Missing cols are added"); + Assert.AreEqual (0, data.Tables[0].PrimaryKey.Length, "#3 Default Value"); + + adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey; + data.Reset(); + adapter.Fill (data); + Assert.AreEqual (3, data.Tables[0].Columns.Count, + "#4 Missing cols are added"); + Assert.AreEqual (1, data.Tables[0].PrimaryKey.Length, "#5 Default Value"); + + adapter.MissingSchemaAction = MissingSchemaAction.Ignore ; + data.Reset (); + adapter.Fill (data); + Assert.AreEqual (0, data.Tables.Count, "#6 Data shud be ignored"); + + adapter.MissingSchemaAction = MissingSchemaAction.Error ; + data.Reset(); + try { + adapter.Fill (data); + Assert.Fail ("#8 Exception shud be thrown: Schema Mismatch"); + } catch (InvalidOperationException ex) { + Assert.AreEqual (typeof(InvalidOperationException), ex.GetType(), + "#9"); + } + + // Test for invalid MissingSchema Value + try { + adapter.MissingSchemaAction = (MissingSchemaAction)(-5000); + Assert.Fail ("#10 Exception shud be thrown: Invalid Value"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#11"); + } + + // Tests if Data is filled correctly if schema is defined + // manually and MissingSchemaAction.Error is set + adapter.MissingSchemaAction = MissingSchemaAction.Error; + data.Reset(); + DataTable table = data.Tables.Add ("Table"); + table.Columns.Add ("id"); + table.Columns.Add ("type_bit"); + table.Columns.Add ("type_int"); + adapter.Fill (data); + Assert.AreEqual (1, data.Tables.Count, "#12"); + Assert.AreEqual (4, data.Tables[0].Rows.Count, "#13"); + } + + [Test] + [Category("NotWorking")] + public void MissingMappingActionTest () + { + adapter = new SqlDataAdapter ("select id,type_bit from numeric_family where id=1", + connectionString); + data = new DataSet (); + Assert.AreEqual (adapter.MissingMappingAction, + MissingMappingAction.Passthrough, + "#1 Default Value"); + adapter.Fill(data); + Assert.AreEqual (1, data.Tables.Count, + "#2 One Table shud be created"); + Assert.AreEqual (2, data.Tables[0].Columns.Count, + "#3 Two Cols shud be created"); + + adapter.MissingMappingAction = MissingMappingAction.Ignore; + data.Reset (); + adapter.Fill (data); + Assert.AreEqual (0, data.Tables.Count, "#4 No table shud be created"); + + adapter.MissingMappingAction = MissingMappingAction.Error; + data.Reset (); + try { + adapter.Fill (data); + Assert.Fail ("#5 Exception shud be thrown : Mapping is missing"); + } catch (InvalidOperationException ex) { + Assert.AreEqual (typeof(InvalidOperationException), ex.GetType(), + "#6"); + } + + try { + adapter.MissingMappingAction = (MissingMappingAction)(-5000); + Assert.Fail ("#7 Exception shud be thrown : Invalid Value"); + } catch (ArgumentOutOfRangeException ex) { + Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), + "#8"); + } + + // Test if mapping the column and table names works correctly + adapter.MissingMappingAction = MissingMappingAction.Error; + data.Reset (); + DataTable table = data.Tables.Add ("numeric_family_1"); + table.Columns.Add ("id_1"); + table.Columns.Add ("type_bit_1"); + table.Columns.Add ("type_int_1"); + DataTableMapping tableMap = adapter.TableMappings.Add ("numeric_family", + "numeric_family_1"); + tableMap.ColumnMappings.Add ("id", "id_1"); + tableMap.ColumnMappings.Add ("type_bit", "type_bit_1"); + tableMap.ColumnMappings.Add ("type_int", "type_int_1"); + adapter.Fill (data,"numeric_family"); + Assert.AreEqual (1, data.Tables.Count , + "#8 The DataTable shud be correctly mapped"); + Assert.AreEqual (3, data.Tables[0].Columns.Count, + "#9 The DataColumns shud be corectly mapped"); + Assert.AreEqual (1, data.Tables[0].Rows.Count, + "#10 Data shud be populated if mapping is correct"); + } + + [Test] // bug #76433 + public void FillSchema_ValuesTest() + { + using (SqlConnection conn = new SqlConnection(connectionString)) { + conn.Open(); + IDbCommand command = conn.CreateCommand(); + + // Create Temp Table + String cmd = "Create Table #tmp_TestTable (" ; + cmd += "Field1 DECIMAL (10) NOT NULL,"; + cmd += "Field2 DECIMAL(19))"; + command.CommandText = cmd; + command.ExecuteNonQuery(); + + DataSet dataSet = new DataSet(); + string selectString = "SELECT * FROM #tmp_TestTable"; + IDbDataAdapter dataAdapter = new SqlDataAdapter ( + selectString, conn); + dataAdapter.FillSchema(dataSet, SchemaType.Mapped); + + Assert.AreEqual (1, dataSet.Tables.Count, "#1"); + Assert.IsFalse (dataSet.Tables[0].Columns[0].AllowDBNull,"#2"); + Assert.IsTrue (dataSet.Tables[0].Columns[1].AllowDBNull,"#3"); + } + } + + [Test] + public void Fill_CheckSchema () + { + using (SqlConnection conn = new SqlConnection(connectionString)) { + conn.Open(); + + IDbCommand command = conn.CreateCommand(); + + // Create Temp Table + String cmd = "Create Table #tmp_TestTable (" ; + cmd += "id int primary key,"; + cmd += "field int not null)"; + command.CommandText = cmd; + command.ExecuteNonQuery(); + + DataSet dataSet = new DataSet(); + string selectString = "SELECT * from #tmp_TestTable"; + IDbDataAdapter dataAdapter = new SqlDataAdapter ( + selectString,conn); + dataAdapter.Fill (dataSet); + Assert.AreEqual (1, dataSet.Tables.Count, "#A1"); + Assert.AreEqual (2, dataSet.Tables [0].Columns.Count, "#A2"); + Assert.IsTrue (dataSet.Tables [0].Columns [1].AllowDBNull, "#A3"); + Assert.AreEqual (0, dataSet.Tables [0].PrimaryKey.Length, "#A4"); + + dataSet.Reset (); + dataAdapter.MissingSchemaAction = MissingSchemaAction.AddWithKey; + dataAdapter.Fill (dataSet); + Assert.AreEqual (1, dataSet.Tables.Count, "#B1"); + Assert.AreEqual (2, dataSet.Tables [0].Columns.Count, "#B2"); + Assert.IsFalse (dataSet.Tables [0].Columns [1].AllowDBNull, "#B3"); + if (ClientVersion == 7) + Assert.AreEqual (0, dataSet.Tables [0].PrimaryKey.Length, "#B4"); + else + Assert.AreEqual (1, dataSet.Tables [0].PrimaryKey.Length, "#B4"); + } + } + + [Test] + public void FillSchema_CheckSchema () + { + using (SqlConnection conn = new SqlConnection(connectionString)) { + conn.Open(); + + IDbCommand command = conn.CreateCommand(); + + // Create Temp Table + String cmd = "Create Table #tmp_TestTable (" ; + cmd += "id int primary key,"; + cmd += "field int not null)"; + command.CommandText = cmd; + command.ExecuteNonQuery(); + + DataSet dataSet = new DataSet(); + string selectString = "SELECT * from #tmp_TestTable"; + IDbDataAdapter dataAdapter = new SqlDataAdapter ( + selectString,conn); + + dataAdapter.FillSchema (dataSet, SchemaType.Mapped); + Assert.IsFalse (dataSet.Tables[0].Columns[1].AllowDBNull, "#1"); + + dataSet.Reset (); + dataAdapter.MissingSchemaAction = MissingSchemaAction.Add; + dataAdapter.FillSchema (dataSet, SchemaType.Mapped); + Assert.IsFalse (dataSet.Tables[0].Columns[1].AllowDBNull, "#2"); + + dataSet.Reset (); + dataAdapter.MissingSchemaAction = MissingSchemaAction.Ignore; + dataAdapter.FillSchema (dataSet, SchemaType.Mapped); + Assert.AreEqual (0, dataSet.Tables.Count, "#3"); + + dataSet.Reset (); + dataAdapter.MissingSchemaAction = MissingSchemaAction.Error; + try { + dataAdapter.FillSchema (dataSet, SchemaType.Mapped); + Assert.Fail ("#4 Error should be thrown"); + } catch (InvalidOperationException ex) { + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#4"); + } + } + } + + [Test] + [Ignore("TODO: Set SSPI Connection String")] + public void CreateViewSSPITest () + { + var conn = ConnectionManager.Instance.Sql.Connection; + + string sql = "create view MONO_TEST_VIEW as select * from Numeric_family"; + + SqlCommand dbcmd = new SqlCommand( sql, conn ); + dbcmd.ExecuteNonQuery(); + + sql = "drop view MONO_TEST_VIEW"; + + dbcmd = new SqlCommand( sql, conn ); + dbcmd.ExecuteNonQuery(); + + conn.Close(); + } + + [Test] + public void Fill_RelatedTables () + { + SqlConnection conn = new SqlConnection(connectionString); + using (conn) { + conn.Open(); + IDbCommand command = conn.CreateCommand(); + + DataSet dataSet = new DataSet(); + string selectString = "SELECT id, type_int from numeric_family where id < 3"; + DbDataAdapter dataAdapter = new SqlDataAdapter (selectString,conn); + + DataTable table2 = dataSet.Tables.Add ("table2"); + DataColumn ccol1 = table2.Columns.Add ("id", typeof (int)); + DataColumn ccol2 = table2.Columns.Add ("type_int", typeof (int)); + + DataTable table1 = dataSet.Tables.Add ("table1"); + DataColumn pcol1 = table1.Columns.Add ("id", typeof (int)); + DataColumn pcol2 = table1.Columns.Add ("type_int", typeof (int)); + + table2.Constraints.Add ("fk", pcol1, ccol1); + //table1.Constraints.Add ("fk1", pcol2, ccol2); + + dataSet.EnforceConstraints = false; + dataAdapter.Fill (dataSet, "table1"); + dataAdapter.Fill (dataSet, "table2"); + + //Should not throw an exception + dataSet.EnforceConstraints = true; + + Assert.AreEqual (2, table1.Rows.Count, "#1"); + Assert.AreEqual (2, table2.Rows.Count, "#2"); + } + } + + [Test] + public void UpdateBatchSizeTest () + { + adapter = new SqlDataAdapter(); + Assert.AreEqual (1, adapter.UpdateBatchSize, "#1 The default value should be 1"); + adapter.UpdateBatchSize = 3; + Assert.AreEqual (3, adapter.UpdateBatchSize, "#2 The value should be 3 after setting the property UpdateBatchSize to 3"); + } + + [Test] + [ExpectedException (typeof (ArgumentOutOfRangeException))] + public void UpdateBatchSizeArgumentOutOfRangeTest () + { + adapter = new SqlDataAdapter(); + adapter.UpdateBatchSize = -2; + } + + int ClientVersion { + get { + return (engine.ClientVersion); + } + } + } + + [TestFixture] + [Category ("sqlserver")] + public class SqlDataAdapterInheritTest : DbDataAdapter + { + SqlConnection conn = null; + + [Test] + public void FillDataAdapterTest () + { + conn = ConnectionManager.Instance.Sql.Connection; + try + { + DataTable dt = new DataTable(); + SqlCommand command = new SqlCommand (); + command.CommandText = "Select * from employee;"; + command.Connection = conn; + SelectCommand = command; + Fill (dt, command.ExecuteReader ()); + Assert.AreEqual (4, dt.Rows.Count, "#1"); + Assert.AreEqual (6, dt.Columns.Count, "#2"); + } finally { + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + ConnectionManager.Instance.Sql.CloseConnection (); + } + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs.REMOVED.git-id b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs.REMOVED.git-id new file mode 100644 index 0000000000..e520e1910c --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs.REMOVED.git-id @@ -0,0 +1 @@ +d4d0b3e8e2176b00944997fea0b44420813008b4 \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs new file mode 100644 index 0000000000..48181ca6b1 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterCollectionTest.cs @@ -0,0 +1,71 @@ +// +// SqlParameterCollectionTest.cs - NUnit Test Cases for testing the +// SqlParameterCollection class +// Author: +// Amit Biswas (amit@amitbiswas.com) +// +// Copyright (c) 2007 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + + public class SqlParameterCollectionTest + { + EngineConfig engine; + + [SetUp] + public void SetUp () + { + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [Test] + public void CopyToTest () + { + SqlCommand cmd = new SqlCommand (); + cmd.CommandText = "SELECT fname FROM employee WHERE fname=@fname AND lname=@lname"; + SqlParameter p1Fname = cmd.Parameters.Add ("@fname", SqlDbType.VarChar, 15); + SqlParameter p1Lname = cmd.Parameters.Add ("@lname", SqlDbType.VarChar, 15); + + Assert.AreEqual (2, cmd.Parameters.Count, "#1 Initialization error, parameter collection must contain 2 elements"); + + SqlParameter [] destinationArray = new SqlParameter [4]; + cmd.Parameters.CopyTo (destinationArray, 1); + Assert.AreEqual (4, destinationArray.Length, "#2 The length of destination array should not change"); + Assert.AreEqual (null, destinationArray[0], "#3 The parameter collection is copied at index 1, so the first element should not change"); + Assert.AreEqual (p1Fname, destinationArray[1], "#4 The parameter at index 1 must be p1Fname"); + Assert.AreEqual (p1Lname, destinationArray[2], "#5 The parameter at index 2 must be p1Lname"); + Assert.AreEqual (null, destinationArray[3], "#6 The parameter at index 3 must not change"); + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterTest.cs new file mode 100644 index 0000000000..6e28ff7ff2 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlParameterTest.cs @@ -0,0 +1,494 @@ +// +// SqlParameterTest.cs - NUnit Test Cases for testing the +// SqlParameter class +// Author: +// Senganal T (tsenganal@novell.com) +// Amit Biswas (amit@amitbiswas.com) +// Veerapuram Varadhan (vvaradhan@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.SqlClient; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlParameterTest + { + SqlConnection conn; + SqlCommand cmd; + SqlDataReader rdr; + EngineConfig engine; + + [SetUp] + public void SetUp () + { + conn = ConnectionManager.Instance.Sql.Connection; + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [TearDown] + public void TearDown () + { + if (cmd != null) + cmd.Dispose (); + if (rdr != null) + rdr.Close (); + ConnectionManager.Instance.Close (); + } + + [Test] // bug #324840 + public void ParameterSizeTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Hangs on SQL Server 7.0"); + + string longstring = new String('x', 20480); + SqlParameter prm; + cmd = new SqlCommand ("create table #text1 (ID int not null, Val1 ntext)", conn); + cmd.ExecuteNonQuery (); + cmd.CommandText = "INSERT INTO #text1(ID,Val1) VALUES (@ID,@Val1)"; + prm = new SqlParameter (); + prm.ParameterName = "@ID"; + prm.Value = 1; + cmd.Parameters.Add (prm); + + prm = new SqlParameter (); + prm.ParameterName = "@Val1"; + prm.Value = longstring; + prm.SqlDbType = SqlDbType.NText; // Comment and enjoy the truncation + cmd.Parameters.Add (prm); + cmd.ExecuteNonQuery (); + cmd = new SqlCommand ("select datalength(Val1) from #text1", conn); + Assert.AreEqual (20480 * 2, cmd.ExecuteScalar (), "#1"); + + cmd.CommandText = "INSERT INTO #text1(ID,Val1) VALUES (@ID,@Val1)"; + prm = new SqlParameter (); + prm.ParameterName = "@ID"; + prm.Value = 1; + cmd.Parameters.Add (prm); + + prm = new SqlParameter (); + prm.ParameterName = "@Val1"; + prm.Value = longstring; + //prm.SqlDbType = SqlDbType.NText; + cmd.Parameters.Add (prm); + cmd.ExecuteNonQuery (); + cmd = new SqlCommand ("select datalength(Val1) from #text1", conn); + Assert.AreEqual (20480 * 2, cmd.ExecuteScalar (), "#2"); + + cmd.CommandText = "INSERT INTO #text1(ID,Val1) VALUES (@ID,@Val1)"; + prm = new SqlParameter (); + prm.ParameterName = "@ID"; + prm.Value = 1; + cmd.Parameters.Add (prm); + + prm = new SqlParameter (); + prm.ParameterName = "@Val1"; + prm.Value = longstring; + prm.SqlDbType = SqlDbType.VarChar; + cmd.Parameters.Add (prm); + cmd.ExecuteNonQuery (); + cmd = new SqlCommand ("select datalength(Val1) from #text1", conn); + Assert.AreEqual (20480 * 2, cmd.ExecuteScalar (), "#3"); + cmd = new SqlCommand ("drop table #text1", conn); + cmd.ExecuteNonQuery (); + conn.Close (); + } + + [Test] // bug #382635 + [Category("NotWorking")] + public void ParameterSize_compatibility_Test () + { + string longstring = "abcdefghijklmnopqrstuvwxyz"; + + cmd = new SqlCommand ("create table #bug382635 (description varchar(20))", conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = + "CREATE PROCEDURE #sp_bug382635 (@Desc varchar(20)) " + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "UPDATE #bug382635 SET description = @Desc" + Environment.NewLine + + "END"; + cmd.CommandType = CommandType.Text; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "INSERT INTO #bug382635 " + + "(description) VALUES ('Verifies bug #382635')"; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "#sp_bug382635"; + cmd.CommandType = CommandType.StoredProcedure; + + SqlParameter p1 = new SqlParameter ("@Desc", SqlDbType.NVarChar, 15); + p1.Value = longstring; + Assert.AreEqual (longstring, p1.Value); + cmd.Parameters.Add (p1); + cmd.ExecuteNonQuery (); + + // Test for truncation + SqlCommand selectCmd = new SqlCommand ("SELECT DATALENGTH(description), description from #bug382635", conn); + + rdr = selectCmd.ExecuteReader (); + Assert.IsTrue (rdr.Read (), "#A1"); + Assert.AreEqual (15, rdr.GetValue (0), "#A2"); + Assert.AreEqual (longstring.Substring (0, 15), rdr.GetValue (1), "#A3"); + Assert.AreEqual (longstring, p1.Value, "#A4"); + rdr.Close (); + + // Test to ensure truncation is not done in the Value getter/setter + p1.Size = 12; + p1.Value = longstring.Substring (0, 22); + p1.Size = 14; + cmd.ExecuteNonQuery (); + + rdr = selectCmd.ExecuteReader (); + Assert.IsTrue (rdr.Read (), "#B1"); + Assert.AreEqual (14, rdr.GetValue (0), "#B2"); + Assert.AreEqual (longstring.Substring (0, 14), rdr.GetValue (1), "#B3"); + Assert.AreEqual (longstring.Substring (0, 22), p1.Value, "#B4"); + rdr.Close (); + + // Size exceeds size of value + p1.Size = 40; + cmd.ExecuteNonQuery (); + + rdr = selectCmd.ExecuteReader (); + Assert.IsTrue (rdr.Read (), "#C1"); + Assert.AreEqual (14, rdr.GetValue (0), "#C2"); + Assert.AreEqual (longstring.Substring (0, 14), rdr.GetValue (1), "#C3"); + rdr.Close (); + } + + [Test] + public void ConversionToSqlTypeInvalid () + { + string insert_data = "insert into datetime_family (id, type_datetime) values (6000, @type_datetime)"; + string delete_data = "delete from datetime_family where id = 6000"; + + object [] values = new object [] { + 5, + true, + 40L, + "invalid date", + }; + + try { + for (int i = 0; i < values.Length; i++) { + object value = values [i]; + + cmd = conn.CreateCommand (); + cmd.CommandText = insert_data; + SqlParameter param = cmd.Parameters.Add ("@type_datetime", SqlDbType.DateTime); + param.Value = value; + cmd.Prepare (); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1:" + i); + } catch (InvalidCastException) { + if (value is string) + Assert.Fail ("#2"); + } catch (FormatException) { + if (!(value is string)) + Assert.Fail ("#3"); + } + } + } finally { + DBHelper.ExecuteNonQuery (conn, delete_data); + } + } + + [Test] // bug #382589 + public void DecimalMaxAsParamValueTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Maximum precision is 28."); + + string create_sp = "CREATE PROCEDURE #sp_bug382539 (@decmax decimal(29,0) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "SET @decmax = 102.34" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_sp, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug382539]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decmax", Decimal.MaxValue); + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + + Assert.AreEqual (Decimal.MaxValue, pValue.Value, "Parameter initialization value mismatch"); + cmd.ExecuteNonQuery(); + + Assert.AreEqual (102m, pValue.Value, "Parameter value mismatch"); + } + + [Test] // bug #382589 + public void DecimalMinAsParamValueTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Maximum precision is 28."); + + string create_sp = "CREATE PROCEDURE #sp_bug382539 (@decmax decimal(29,0) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "SET @decmax = 102.34" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_sp, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug382539]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decmax", Decimal.MinValue); + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + + Assert.AreEqual (Decimal.MinValue, pValue.Value, "Parameter initialization value mismatch"); + cmd.ExecuteNonQuery(); + + Assert.AreEqual (102m, pValue.Value, "Parameter value mismatch"); + } + + [Test] // bug #382589 + public void DecimalMaxAsParamValueExceptionTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Maximum precision is 28."); + + string create_sp = "CREATE PROCEDURE #sp_bug382539 (@decmax decimal(29,10) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "SET @decmax = 102.36" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_sp, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug382539]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decmax", Decimal.MaxValue); + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Error converting data type numeric to decimal + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (8114, ex.Number, "#6"); + Assert.AreEqual ((byte) 5, ex.State, "#7"); + } + } + + [Test] // bug# 382589 + public void DecimalMinAsParamValueExceptionTest () + { + if (ClientVersion == 7) + Assert.Ignore ("Maximum precision is 28."); + + string create_sp = "CREATE PROCEDURE #sp_bug382539 (@decmax decimal(29,10) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "SET @decmax = 102.36" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_sp, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug382539]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decmax", Decimal.MinValue); + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Error converting data type numeric to decimal + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.AreEqual (8114, ex.Number, "#6"); + Assert.AreEqual ((byte) 5, ex.State, "#7"); + } + } + + [Test] // bug #526794 + public void ZeroLengthString () + { + cmd = new SqlCommand ("create table #bug526794 (name varchar(20) NULL)", conn); + cmd.ExecuteNonQuery (); + + SqlParameter param; + + param = new SqlParameter ("@name", SqlDbType.VarChar); + param.Value = string.Empty; + + cmd = new SqlCommand ("insert into #bug526794 values (@name)", conn); + cmd.Parameters.Add (param); + cmd.ExecuteNonQuery (); + + cmd = new SqlCommand ("select * from #bug526794", conn); + rdr = cmd.ExecuteReader (); + Assert.IsTrue (rdr.Read (), "#A1"); + Assert.AreEqual (string.Empty, rdr.GetValue (0), "#A2"); + rdr.Close (); + + param = new SqlParameter ("@name", SqlDbType.Int); + param.Value = string.Empty; + + cmd = new SqlCommand ("insert into #bug526794 values (@name)", conn); + cmd.Parameters.Add (param); + + try { + cmd.ExecuteNonQuery (); + Assert.Fail ("#B1"); + } catch (FormatException ex) { + // Failed to convert parameter value from a String to a Int32 + Assert.AreEqual (typeof (FormatException), ex.GetType (), "#B2"); + Assert.IsNotNull (ex.Message, "#B3"); + Assert.IsTrue (ex.Message.IndexOf (typeof (string).Name) != -1, "#B4"); + Assert.IsTrue (ex.Message.IndexOf (typeof (int).Name) != -1, "#B5"); + + // Input string was not in a correct format + Exception inner = ex.InnerException; + Assert.IsNotNull (inner, "#B6"); + Assert.AreEqual (typeof (FormatException), inner.GetType (), "#B7"); + Assert.IsNull (inner.InnerException, "#B8"); + Assert.IsNotNull (inner.Message, "#B9"); + } + } + + [Test] // bug #595918 + public void DecimalDefaultScaleTest () + { + string create_tbl = "CREATE TABLE #decimalScaleCheck (decsclcheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE #sp_bug595918(@decsclcheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO #decimalScaleCheck values (@decsclcheck)" + Environment.NewLine + + "SELECT @decsclcheck=decsclcheck from #decimalScaleCheck" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_tbl, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug595918]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decsclcheck", SqlDbType.Decimal); + pValue.Value = 128.425; + pValue.Precision = 19; + pValue.Scale = 3; + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + cmd.ExecuteNonQuery(); + + Assert.AreEqual (128.425, pValue.Value, "Stored decimal value is incorrect - DS - Bug#595918"); + } + + [Test] // bug #595918 + public void DecimalGreaterScaleTest () + { + string create_tbl = "CREATE TABLE #decimalScaleCheck (decsclcheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE #sp_bug595918(@decsclcheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO #decimalScaleCheck values (@decsclcheck)" + Environment.NewLine + + "SELECT @decsclcheck=decsclcheck from #decimalScaleCheck" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_tbl, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug595918]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decsclcheck", SqlDbType.Decimal); + pValue.Value = 128.425; + pValue.Precision = 19; + pValue.Scale = 5; + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + cmd.ExecuteNonQuery(); + + Assert.AreEqual (128.42500, pValue.Value, "Stored decimal value is incorrect - GS - Bug#595918"); + } + + [Test] // bug #595918 + public void DecimalLesserScaleTest () + { + string create_tbl = "CREATE TABLE #decimalScaleCheck (decsclcheck DECIMAL (19, 5) null)"; + string create_sp = "CREATE PROCEDURE #sp_bug595918(@decsclcheck decimal(19,5) OUT)" + + "AS " + Environment.NewLine + + "BEGIN" + Environment.NewLine + + "INSERT INTO #decimalScaleCheck values (@decsclcheck)" + Environment.NewLine + + "SELECT @decsclcheck=decsclcheck from #decimalScaleCheck" + Environment.NewLine + + "END"; + + cmd = new SqlCommand (create_tbl, conn); + cmd.ExecuteNonQuery (); + + cmd.CommandText = create_sp; + cmd.ExecuteNonQuery (); + + cmd.CommandText = "[#sp_bug595918]"; + cmd.CommandType = CommandType.StoredProcedure; + SqlParameter pValue = new SqlParameter("@decsclcheck", SqlDbType.Decimal); + pValue.Value = 128.425; + pValue.Precision = 19; + pValue.Scale = 2; + pValue.Direction = ParameterDirection.InputOutput; + cmd.Parameters.Add(pValue); + cmd.ExecuteNonQuery(); + + Assert.AreEqual (128.42, pValue.Value, "Stored decimal value is incorrect - LS - Bug#595918"); + } + + int ClientVersion { + get { + return (engine.ClientVersion); + } + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlTransactionTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlTransactionTest.cs new file mode 100644 index 0000000000..6bfa124143 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlTransactionTest.cs @@ -0,0 +1,2072 @@ +// +// SqlTransactionTest.cs - NUnit Test Cases for testing the +// SqlTransaction class +// Author: +// Umadevi S (sumadevi@novell.com) +// Sureshkumar T (tsureshkumar@novell.com) +// +// Copyright (c) 2004 Novell Inc., and the individuals listed +// on the ChangeLog entries. +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.Data.Common; +using System.Data.SqlClient; + +using NUnit.Framework; + +namespace MonoTests.System.Data.Connected.SqlClient +{ + [TestFixture] + [Category ("sqlserver")] + public class SqlTransactionTest + { + SqlConnection conn; + SqlTransaction trans; + String connectionString; + EngineConfig engine; + + [SetUp] + public void SetUp () + { + connectionString = ConnectionManager.Instance.Sql.ConnectionString; + engine = ConnectionManager.Instance.Sql.EngineConfig; + } + + [TearDown] + public void TearDown () + { + if (conn != null) + conn.Dispose (); + if (trans != null) + trans.Dispose (); + } + + [Test] + public void Commit () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + using (trans = connA.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, connA, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connA, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#A1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#A2"); + Assert.IsFalse (reader.Read (), "#A3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connB); + cmd.CommandTimeout = 2; + try { + cmd.ExecuteReader (); + Assert.Fail ("#B1"); + } catch (SqlException ex) { + // Timeout expired. The timeout period + // elapsed prior to completion of the + // operation or the server is not responding + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#B2"); + Assert.AreEqual ((byte) 11, ex.Class, "#B3"); + Assert.IsNotNull (ex.Message, "#B5"); + Assert.AreEqual (-2, ex.Number, "#B6"); + Assert.AreEqual ((byte) 0, ex.State, "#B7"); + } + + trans.Commit (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connB); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connA); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#D2"); + Assert.IsFalse (reader.Read (), "#D3"); + } + } + } finally { + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Commit_Connection_Closed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + try { + trans.Commit (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Commit_Reader_Open () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + SqlCommand cmd; + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + try { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + cmd = new SqlCommand ("select @@version", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + try { + trans.Commit (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Command which + // must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + } + + trans.Dispose (); + conn.Close (); + + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#C1"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Commit_Transaction_Committed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Commit (); + + try { + trans.Commit (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#B2"); + Assert.IsFalse (reader.Read (), "#B3"); + } + + conn.Close (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Commit_Transaction_Disposed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Dispose (); + + try { + trans.Commit (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Commit_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback (); + + try { + trans.Commit (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback ("SAVE1"); + trans.Commit (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#D2"); + Assert.IsFalse (reader.Read (), "#D3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#E1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Connection_Transaction_Committed () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Commit (); + + Assert.IsNull (trans.Connection); + } + + [Test] + public void Connection_Transaction_Disposed () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Dispose (); + + Assert.IsNull (trans.Connection); + } + + [Test] + public void Connection_Transaction_Open () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + Assert.AreSame (conn, trans.Connection); + } + + [Test] + public void Connection_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + try { + trans.Rollback (); + Assert.IsNull (trans.Connection); + } finally { + trans.Dispose (); + } + + trans = conn.BeginTransaction (); + trans.Save ("SAVE1"); + try { + trans.Rollback ("SAVE1"); + Assert.AreSame (conn, trans.Connection); + } finally { + trans.Dispose (); + } + } + + [Test] + public void Connection_Transaction_Saved () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Save ("SAVE1"); + + Assert.AreSame (conn, trans.Connection); + } + + [Test] + public void Dispose () + { + string sql; + SqlCommand cmd = null; + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Dispose (); + trans.Dispose (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#2"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Dispose_Connection_Closed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + trans.Dispose (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read ()); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Dispose_Reader_Open () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + SqlCommand cmd = new SqlCommand ("select * from employee", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + try { + trans.Dispose (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Connection + // which must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + try { + trans.Dispose (); + Assert.Fail ("#B1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Connection + // which must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2"); + Assert.IsNull (ex.InnerException, "#B3"); + Assert.IsNotNull (ex.Message, "#B4"); + } + } + + trans.Dispose (); + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + } + } + + [Test] + public void IsolationLevel_Reader_Open () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + try { + SqlCommand cmd = new SqlCommand ("select @@version", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.AreEqual (IsolationLevel.ReadCommitted, trans.IsolationLevel); + } + } finally { + if (trans != null) + trans.Dispose (); + } + } + + [Test] + public void IsolationLevel_Transaction_Committed () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Commit (); + + try { + IsolationLevel iso = trans.IsolationLevel; + Assert.Fail ("#1:" + iso); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void IsolationLevel_Transaction_Disposed () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Dispose (); + + try { + IsolationLevel iso = trans.IsolationLevel; + Assert.Fail ("#1:" + iso); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + + [Test] + public void IsolationLevel_Transaction_Open () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + Assert.AreEqual (IsolationLevel.ReadCommitted, trans.IsolationLevel); + } + + [Test] + public void IsolationLevel_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Rollback (); + + try { + IsolationLevel iso = trans.IsolationLevel; + Assert.Fail ("#A1:" + iso); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } finally { + trans.Dispose (); + } + + trans = conn.BeginTransaction (); + trans.Save ("SAVE1"); + trans.Rollback ("SAVE1"); + + Assert.AreEqual (IsolationLevel.ReadCommitted, trans.IsolationLevel, "#B1"); + } + + [Test] + public void IsolationLevel_Transaction_Saved () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Save ("SAVE1"); + Assert.AreEqual (IsolationLevel.ReadCommitted, trans.IsolationLevel); + } + + [Test] // Rollback () + public void Rollback1 () + { + string sql; + SqlCommand cmd = null; + SqlConnection connA = null; + SqlConnection connB = null; + + try { + connA = new SqlConnection (connectionString); + connA.Open (); + + connB = new SqlConnection (connectionString); + connB.Open (); + + using (trans = connA.BeginTransaction ()) { + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, connA, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connA, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#A1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#A2"); + Assert.IsFalse (reader.Read (), "#A3"); + } + + trans.Rollback (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connA); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", connB); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#C1"); + } + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (connA != null) + connA.Close (); + if (connB != null) + connB.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE2"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6668, 'Novell', '1997-04-07', '2003-06-25')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback (); + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#D1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#E1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6668", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#F1"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + trans.Rollback (); + } finally { + if (trans != null) + trans.Dispose (); + } + } + + [Test] // Rollback () + public void Rollback1_Connection_Closed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + try { + trans.Rollback (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback () + public void Rollback1_Reader_Open () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + SqlCommand cmd; + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + try { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + cmd = new SqlCommand ("select @@version", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + try { + trans.Rollback (); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Command which + // must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + } finally { + if (trans != null) + trans.Dispose (); + } + } + + [Test] // Rollback () + public void Rollback1_Transaction_Committed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Commit (); + + try { + trans.Rollback (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#B2"); + Assert.IsFalse (reader.Read (), "#B3"); + } + + conn.Close (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback () + public void Rollback1_Transaction_Disposed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Dispose (); + trans.Rollback (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback () + public void Rollback1_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback (); + + try { + trans.Rollback (); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback ("SAVE1"); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + + trans.Rollback (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#D1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2 () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + string sql; + SqlCommand cmd = null; + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE2"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6668, 'Novell', '1997-04-07', '2003-06-25')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE3"); + + trans.Rollback ("SAVE1"); + trans.Commit (); + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#A1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#A2"); + Assert.IsFalse (reader.Read (), "#A3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6668", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#C1"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE2"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6668, 'Novell', '1997-04-07', '2003-06-25')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + trans.Rollback ("SAVE1"); + trans.Commit (); + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#D2"); + Assert.IsFalse (reader.Read (), "#D3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#E1"); + Assert.AreEqual ("BangaloreNovell", reader.GetString (0), "#E2"); + Assert.IsFalse (reader.Read (), "#E3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6668", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#F1"); + Assert.AreEqual ("Novell", reader.GetString (0), "#F2"); + Assert.IsFalse (reader.Read (), "#F3"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2_Connection_Closed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2_Reader_Open () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + SqlCommand cmd; + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + try { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + cmd = new SqlCommand ("select @@version", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Command which + // must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + } finally { + if (trans != null) + trans.Dispose (); + } + } + + [Test] // Rollback (String) + public void Rollback2_Transaction_Committed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Commit (); + + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#B2"); + Assert.IsFalse (reader.Read (), "#B3"); + } + + conn.Close (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2_Transaction_Disposed () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Dispose (); + + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback (); + + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + trans.Rollback ("SAVE1"); + + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#C1"); + } catch (SqlException ex) { + // Cannot roll back SAVE1. No transaction + // or savepoint of that name was found + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#C2"); + Assert.AreEqual ((byte) 16, ex.Class, "#C3"); + Assert.IsNull (ex.InnerException, "#C4"); + Assert.IsNotNull (ex.Message, "#C5"); + Assert.IsTrue (ex.Message.IndexOf ("SAVE1") != -1, "#C6"); + Assert.AreEqual (6401, ex.Number, "#C7"); + Assert.AreEqual ((byte) 1, ex.State, "#C8"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] // Rollback (String) + public void Rollback2_TransactionName_DoesNotExist () + { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + try { + trans.Rollback ("SAVE1"); + Assert.Fail ("#1"); + } catch (SqlException ex) { + // Cannot roll back SAVE1. No transaction + // or savepoint of that name was found + Assert.AreEqual (typeof (SqlException), ex.GetType (), "#2"); + Assert.AreEqual ((byte) 16, ex.Class, "#3"); + Assert.IsNull (ex.InnerException, "#4"); + Assert.IsNotNull (ex.Message, "#5"); + Assert.IsTrue (ex.Message.IndexOf ("SAVE1") != -1, "#6"); + Assert.AreEqual (6401, ex.Number, "#7"); + if (ClientVersion == 7) + Assert.AreEqual ((byte) 2, ex.State, "#8"); + else + Assert.AreEqual ((byte) 1, ex.State, "#8"); + } + + trans.Commit (); + } + } + + [Test] // Rollback (String) + public void Rollback2_TransactionName_Empty () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + try { + trans.Rollback (string.Empty); + Assert.Fail ("#1"); + } catch (ArgumentException ex) { + // Invalid transaction or invalid name + // for a point at which to save within + // the transaction + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsNull (ex.ParamName, "#5"); + } + + trans.Commit (); + } + } + + [Test] // Rollback (String) + public void Rollback2_TransactionName_Null () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + try { + trans.Rollback ((string) null); + Assert.Fail ("#1"); + } catch (ArgumentException ex) { + // Invalid transaction or invalid name + // for a point at which to save within + // the transaction + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + Assert.IsNull (ex.ParamName, "#5"); + } + + trans.Commit (); + } + } + + [Test] + public void Save_Connection_Closed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + try { + trans.Save ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Save () + { + string sql; + SqlCommand cmd = null; + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE2"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6668, 'Novell', '1997-04-07', '2003-06-25')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#A1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6668", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#C1"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6667, 'BangaloreNovell', '1999-03-10', '2006-08-23')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE2"); + + sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6668, 'Novell', '1997-04-07', '2003-06-25')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Commit (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#D2"); + Assert.IsFalse (reader.Read (), "#D3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6667", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#E1"); + Assert.AreEqual ("BangaloreNovell", reader.GetString (0), "#E2"); + Assert.IsFalse (reader.Read (), "#E3"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6668", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#F1"); + Assert.AreEqual ("Novell", reader.GetString (0), "#F2"); + Assert.IsFalse (reader.Read (), "#F3"); + } + } finally { + if (cmd != null) + cmd.Dispose (); + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Save_Reader_Open () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + SqlCommand cmd; + + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + try { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + cmd = new SqlCommand ("select @@version", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + try { + trans.Save ("SAVE1"); + Assert.Fail ("#1"); + } catch (InvalidOperationException ex) { + // There is already an open DataReader + // associated with this Command which + // must be closed first + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2"); + Assert.IsNull (ex.InnerException, "#3"); + Assert.IsNotNull (ex.Message, "#4"); + } + } + } finally { + if (trans != null) + trans.Dispose (); + } + } + + [Test] + public void Save_Transaction_Committed () + { + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Commit (); + + try { + trans.Save ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#B2"); + Assert.IsFalse (reader.Read (), "#B3"); + } + + conn.Close (); + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#C1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#C2"); + Assert.IsFalse (reader.Read (), "#C3"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Save_Transaction_Disposed () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Dispose (); + + try { + trans.Save ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Save_Transaction_Rolledback () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Rollback (); + + try { + trans.Save ("SAVE1"); + Assert.Fail ("#A1"); + } catch (InvalidOperationException ex) { + // This SqlTransaction has completed; it is no + // longer usable + Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + } + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } + + using (trans = conn.BeginTransaction ()) { + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + trans.Save ("SAVE1"); + trans.Rollback ("SAVE1"); + trans.Save ("SAVE1"); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn, trans); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#D1"); + } + } + } finally { + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + public void Save_TransactionName_Empty () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + try { + trans.Save (string.Empty); + Assert.Fail ("#A1"); + } catch (ArgumentException ex) { + // Invalid transaction or invalid name + // for a point at which to save within + // the transaction + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsNull (ex.ParamName, "#A5"); + } + + trans.Rollback (); + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsFalse (reader.Read (), "#B1"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + [Test] + [Ignore("Deesn't work on mono. TODO:Fix")] + public void Save_TransactionName_Null () + { + if (RunningOnMono) + Assert.Ignore ("NotWorking"); + + try { + conn = new SqlConnection (connectionString); + conn.Open (); + + trans = conn.BeginTransaction (); + + string sql = "INSERT INTO employee (id, fname, dob, doj) VALUES (6666, 'NovellBangalore', '1989-02-11', '2005-07-22')"; + SqlCommand cmd = new SqlCommand (sql, conn, trans); + cmd.ExecuteNonQuery (); + cmd.Dispose (); + + try { + trans.Save ((string) null); + Assert.Fail ("#A1"); + } catch (ArgumentException ex) { + // Invalid transaction or invalid name + // for a point at which to save within + // the transaction + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2"); + Assert.IsNull (ex.InnerException, "#A3"); + Assert.IsNotNull (ex.Message, "#A4"); + Assert.IsNull (ex.ParamName, "#A5"); + } + + trans.Commit (); + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + + cmd = new SqlCommand ("SELECT fname FROM employee WHERE id=6666", conn); + using (SqlDataReader reader = cmd.ExecuteReader ()) { + Assert.IsTrue (reader.Read (), "#B1"); + Assert.AreEqual ("NovellBangalore", reader.GetString (0), "#B2"); + Assert.IsFalse (reader.Read (), "#B3"); + } + } finally { + if (trans != null) + trans.Dispose (); + if (conn != null) + conn.Close (); + + conn = new SqlConnection (connectionString); + conn.Open (); + DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); + } + } + + int ClientVersion { + get { + return (engine.ClientVersion); + } + } + + static bool RunningOnMono { + get + { + return (Type.GetType ("System.MonoType", false) != null); + } + } + } +} diff --git a/mcs/class/System.Data/Test/ProviderTests/sql/MySQL_5.sql b/mcs/class/System.Data/Test/ProviderTests/sql/MySQL_5.sql new file mode 100644 index 0000000000..40655643bc --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/sql/MySQL_5.sql @@ -0,0 +1,222 @@ +/* +========================================================================================= +MySQL_5.sql +Author: Amit Biswas (amit@amitbiswas.com) + +This sql script performs the same operations as "mysql.sql" but some sql commands +have been changed either to fix bugs or to comply with MySQL Server 5.0 +15-Dec-2007 + +Changes: +-------- +In numeric_family, the unsigned attribute was added to column type_tinyint to allow it to store the value 255, +Reason: tinyint is normally signed and stores from -128 to 127 (http://dev.mysql.com/doc/refman/5.0/en/numeric-types.html) + +In numeric_family, the column type_double was declared as float NULL which cannot store the value 1.79E+308, hence it changed it to float (53) +Reason: MySQL supports the optional precision specification but the precision value is used only +to determine storage size. A precision from 0 to 23 results in a four-byte single-precision FLOAT column. +A precision from 24 to 53 results in an eight-byte double-precision DOUBLE column. +(http://dev.mysql.com/doc/refman/5.0/en/numeric-types.html) + +In binary_family, the column type_binary was declared as binary NULL which cannot store the value 555555, hence changed it to binary (8) +Reason: In case of binary (and varbinary) fields the length indicates bytes, not characters. (http://dev.mysql.com/doc/refman/5.0/en/binary-varbinary.html) +(ERROR: Data too long for column 'type_binary') + +In datetime_family, the column type_smalldatetime was declared as timestamp NULL which cannot store the year 2079, hence changed it to 2037-12-31 23:59:00 +Reason: The range of timestamp is '1970-01-01 00:00:01' to 2037, (http://dev.mysql.com/doc/refman/5.0/en/date-and-time-type-overview.html) +(ERROR: Incorrect datetime value: '2079-06-06 23:59:00' for column 'type_smalldatetime') + +Stored Procedures: +------------------ +Modified the "Create Procedure" statement +Reason: the existing statement doesnt work in MySQL Administrator, MySQL 5.0.27 + +Removed the "Return" statement in the stored procedure sp_get_age +Reason: "Return" is only allowed in a function not in a procedure, u can use "INTO" instead + +=========================================================================================== +*/ + +/* +=================================== OBJECT NUMERIC_FAMILY ========================= +-- TABLE : NUMERIC_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +*/ + +drop table if exists numeric_family; + + +create table `numeric_family` ( + `id` int NOT NULL, + `type_bit` bit NULL, + `type_tinyint` tinyint unsigned NULL, + `type_smallint` smallint NULL, + `type_int` int NULL, + `type_bigint` bigint NULL, + `type_decimal1` decimal (38, 0) NULL, + `type_decimal2` decimal (10, 3) NULL, + `type_numeric1` numeric (38, 0) NULL, + `type_numeric2` numeric (10, 3) NULL, + `type_money` numeric (38,0) NULL, + `type_smallmoney` numeric (12,0) NULL, + `type_float` float(24) NULL, + `type_double` float (53) NULL, + `type_autoincrement` int PRIMARY KEY AUTO_INCREMENT NOT NULL); + +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (1, 1, 255, 32767, 2147483647, 9223372036854775807, 1000, 4456.432, 1000, 4456.432, 922337203685477.5807, 214748.3647, 3.40E+38, 1.79E+308); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (2, 0, 0, -32768, -2147483648, -9223372036854775808, -1000, -4456.432, -1000, -4456.432, -922337203685477.5808, -214748.3648, -3.40E+38, -1.79E+308); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (4, null, null, null, null, null, null, null, null, null, null, null, null, null); + +/* +-- =================================== END OBJECT NUMERIC_FAMILY ======================== + + +-- =================================== OBJECT BINARY_FAMILY ========================= +-- TABLE : BINARY_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +*/ + +drop table if exists binary_family; + +create table `binary_family` ( + `id` int PRIMARY KEY NOT NULL, + `type_binary` binary (8), + `type_varbinary` varbinary (255) NULL, + `type_blob` blob NULL, + `type_tinyblob` tinyblob NULL, + `type_mediumblob` mediumblob NULL, + `type_longblob_image` longblob NULL); + +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 1, + '5', + 0x303132333435363738393031323334353637383930313233343536373839004453, + 0x3256004422, + 0x3A56004422, + 0x2B87002233, + 0x4D84002332 +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 2, + 0x0033340033303531, + 0x003938373635003332313031323334, + 0x0066066697006606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066698, + 0x0056334422, + 0x0087342233, + 0x0084352332 +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 3, + '', + '', + '', + '', + '', + '' +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 4,null,null,null,null,null,null); + +/* +-- =================================== END OBJECT BINARY_FAMILY ======================== + + +-- =================================== OBJECT STRING_FAMILY============================ +-- TABLE : string_family +-- data with id above 6000 is not gaurenteed to be read-only. +*/ + +drop table if exists string_family; + +create table `string_family` ( + `id` int PRIMARY KEY NOT NULL, + `type_char` char(10) NULL, + `type_nchar` char(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci NULL, + `type_varchar` varchar(10) NULL, + `type_nvarchar` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci NULL, + `type_text` text NULL, + `type_ntext` longtext CHARACTER SET ucs2 COLLATE ucs2_general_ci NULL); + +insert into string_family values (1, 'char', 'nchभाr', 'varchar', 'nvभारतr', 'text', 'ntभाxt'); +insert into string_family values (2, '0123456789', '0123456789', 'varchar ', 'nvभारतr ', 'longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext ', 'ntभाxt '); +insert into string_family values (3, '', '', '', '', '', ''); +insert into string_family values (4, null, null, null, null, null, null); + +/* +-- =================================== END OBJECT STRING_FAMILY ======================== + + +-- =================================== OBJECT DATETIME_FAMILY============================ +-- TABLE : datetime_family +-- data with id above 6000 is not gaurenteed to be read-only. +*/ + +drop table if exists datetime_family; + +create table `datetime_family` ( + `id` int PRIMARY KEY NOT NULL, + `type_smalldatetime` timestamp NULL, + `type_datetime` datetime NULL, + `type_time` time NULL, + `type_date` date NULL); + +insert into `datetime_family` values (1,'2037-12-31 23:59:00','9999-12-31 23:59:59','23:58:59','9999-12-31'); +insert into `datetime_family` values (4,null,null,null,null); + +/* +-- =================================== END OBJECT DATETIME_FAMILY======================== + + +-- =================================== OBJECT EMPLOYEE ============================ +-- TABLE : EMPLOYEE +-- data with id above 6000 is not gaurenteed to be read-only. +*/ + +drop table if exists employee; + +create table `employee` ( + `id` int PRIMARY KEY NOT NULL, + `fname` varchar (50) NOT NULL, + `lname` varchar (50), + `dob` datetime NOT NULL, + `doj` datetime NOT NULL, + `email` varchar (50)); + +insert into `employee` values (1, 'suresh', 'kumar', '1978-08-22', '2001-03-12', 'suresh@gmail.com'); +insert into `employee` values (2, 'ramesh', 'rajendran', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); +insert into `employee` values (3, 'venkat', 'ramakrishnan', '1977-06-12', '2003-12-11', 'ramesh@yahoo.com'); +insert into `employee` values (4, 'ramu', 'dhasarath', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); + +/* +-- STORED PROCEDURES +-- SP : sp_clean_person_table +*/ + +delimiter // +drop procedure if exists sp_clean_employee_table +// +CREATE PROCEDURE `sp_clean_employee_table`() +begin + delete from employee where `id` > 6000; +end +// + +/* +-- SP : sp_get_age +*/ + +drop procedure if exists sp_get_age +// +create procedure sp_get_age (fname varchar (50), OUT age int) +begin + select age=datediff (`dob`, now()) from `employee` where `fname` like fname; +end +// +/* +-- =================================== END OBJECT EMPLOYEE ============================ +*/ \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/sql/mysql.sql b/mcs/class/System.Data/Test/ProviderTests/sql/mysql.sql new file mode 100644 index 0000000000..7e4dc926fc --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/sql/mysql.sql @@ -0,0 +1,176 @@ +delimiter // +use monotest +// + +-- =================================== OBJECT NUMERIC_FAMILY ========================= +-- TABLE : NUMERIC_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +drop table if exists numeric_family; +// + +create table numeric_family ( + id int PRIMARY KEY NOT NULL, + type_bit bit NULL, + type_tinyint tinyint NULL, + type_smallint smallint NULL, + type_int int NULL, + type_bigint bigint NULL, + type_decimal decimal (38, 0) NULL, + type_numeric numeric (38, 0) NULL, + type_money numeric (38,0) NULL, + type_smallmoney numeric (12,0) NULL, + type_float real NULL, + type_double float NULL); +-- does not have money & smallmoney types +// + +insert into numeric_family values (1,1,255,32767,2147483647,9223372036854775807,1000,1000,922337203685477.5807,214748.3647,3.40E+38,1.79E+308); +insert into numeric_family values (2,0,0,-32768,-2147483648,-9223372036854775808,-1000,-1000,-922337203685477.5808,-214748.3648,-3.40E+38,-1.79E+308); +insert into numeric_family values (3,0,0,0,0,0,0,0,0,0,0,0); +insert into numeric_family values (4,null,null,null,null,null,null,null,null,null,null,null); + +-- =================================== END OBJECT NUMERIC_FAMILY ======================== + +-- =================================== OBJECT BINARY_FAMILY ========================= +-- TABLE : BINARY_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +drop table if exists binary_family; +// + +create table binary_family ( + id int PRIMARY KEY NOT NULL, + type_binary binary (8) NULL, + type_varbinary varbinary (255) NULL, + type_blob blob NULL, + type_tinyblob tinyblob NULL, + type_mediumblob mediumblob NULL, + type_longblob_image longblob NULL); +// + +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 1, + '5', + '0123456789012345678901234567890123456789012345678901234567890123456789', + '66666666', + '777777', + '888888', + '999999' +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 2, + '03423051', + '098765432101234', + '06660666', + '077077', + '088088', + '099099' +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 3, + '', + '', + '', + '', + '', + '' +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 4,null,null,null,null,null,null); +go +// + +-- =================================== END OBJECT BINARY_FAMILY ======================== + +-- =================================== OBJECT STRING_FAMILY============================ +-- TABLE : string_family +-- data with id above 6000 is not gaurenteed to be read-only. +drop table if exists string_family; +// + +create table string_family ( + id int PRIMARY KEY NOT NULL, + type_char char(10) NULL, + type_varchar varchar(10) NULL, + type_text text NULL, + type_ntext longtext NULL); +// + +grant all privileges on string_family to monotester; +// + +insert into string_family values (1,"char","varchar","text","ntext"); +insert into string_family values (2, '0123456789','varchar' ,'longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext ','ntext'); +insert into string_family values (4,null,null,null,null); +// +-- =================================== END OBJECT STRING_FAMILY ======================== + +-- =================================== OBJECT DATETIME_FAMILY============================ +-- TABLE : datetime_family +-- data with id above 6000 is not gaurenteed to be read-only. + +drop table if exists datetime_family; +// + +create table datetime_family ( + id int PRIMARY KEY NOT NULL, + type_smalldatetime timestamp NULL, + type_datetime datetime NULL); + +grant all privileges on datetime_family to monotester; +// + +insert into datetime_family values (1,'2079-06-06 23:59:00','9999-12-31 23:59:59.997'); +insert into datetime_family values (4,null,null); +// + +-- =================================== END OBJECT DATETIME_FAMILY======================== + + +-- =================================== OBJECT EMPLOYEE ============================ +-- TABLE : EMPLOYEE +-- data with id above 6000 is not gaurenteed to be read-only. +drop table if exists employee; +// + +create table employee ( + id int PRIMARY KEY NOT NULL, + fname varchar (50) NOT NULL, + lname varchar (50), + dob datetime NOT NULL, + doj datetime NOT NULL, + email varchar (50)); + +grant all privileges on employee to monotester; + +insert into employee values (1, 'suresh', 'kumar', '1978-08-22', '2001-03-12', 'suresh@gmail.com'); +insert into employee values (2, 'ramesh', 'rajendran', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); +insert into employee values (3, 'venkat', 'ramakrishnan', '1977-06-12', '2003-12-11', 'ramesh@yahoo.com'); +insert into employee values (4, 'ramu', 'dhasarath', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); +// + +-- STORED PROCEDURES +-- SP : sp_clean_person_table +drop procedure if exists sp_clean_employee_table; +// + +create procedure sp_clean_employee_table () +begin + delete from employee where id > 6000; +end +// + +-- SP : sp_get_age +drop procedure if exists sp_get_age; +// + +create procedure sp_get_age ( + fname varchar (50), + OUT age int) +as +begin + select age = datediff (day, dob, getdate ()) from employee where fname like fname; + return age; +end +// + +-- =================================== END OBJECT EMPLOYEE ============================ diff --git a/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver.sql b/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver.sql new file mode 100644 index 0000000000..34a343acca --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver.sql @@ -0,0 +1,233 @@ +-- =================================== OBJECT NUMERIC_FAMILY============================ +-- TABLE : NUMERIC_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'numeric_family' and type = 'U') + drop table numeric_family; +go + +create table numeric_family ( + id int PRIMARY KEY NOT NULL, + type_bit bit NULL, + type_tinyint tinyint NULL, + type_smallint smallint NULL, + type_int int NULL, + type_bigint bigint NULL, + type_decimal1 decimal(38,0) NULL, + type_decimal2 decimal(10,3) NULL, + type_numeric1 numeric(38,0) NULL, + type_numeric2 numeric(10,3) NULL, + type_money money NULL, + type_smallmoney smallmoney NULL, + type_float real NULL, + type_double float NULL, + type_autoincrement int identity (2, 3)); +go + + +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (1, 1, 255, 32767, 2147483647, 9223372036854775807, 1000, 4456.432, 1000, 4456.432, 922337203685477.5807, 214748.3647, 3.40E+38, 1.79E+308); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (2, 0, 0, -32768, -2147483648, -9223372036854775808, -1000, -4456.432, -1000, -4456.432, -922337203685477.5808, -214748.3648, -3.40E+38, -1.79E+308); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +insert into numeric_family (id, type_bit, type_tinyint, type_smallint, type_int, type_bigint, type_decimal1, type_decimal2, type_numeric1, type_numeric2, type_money, type_smallmoney, type_float, type_double) + values (4, null, null, null, null, null, null, null, null, null, null, null, null, null); +go +-- =================================== END OBJECT NUMERIC_FAMILY ======================== + +-- =================================== OBJECT BINARY_FAMILY ========================= +-- TABLE : BINARY_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'binary_family' and type = 'U') + drop table binary_family; +go + +create table binary_family ( + id int PRIMARY KEY NOT NULL, + type_binary binary (8) NULL, + type_varbinary varbinary (255) NULL, + type_blob image NULL, + type_tinyblob image NULL, + type_mediumblob image NULL, + type_longblob_image image NULL, + type_timestamp timestamp NULL); +go + +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 1, + convert (binary, '5'), + convert (varbinary(255), 0x303132333435363738393031323334353637383930313233343536373839004453), + convert (image, 0x3256004422), + convert (image, 0x3A56004422), + convert (image, 0x2B87002233), + convert (image, 0x4D84002332) +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 2, + convert (binary, 0x0033340033303531), + convert (varbinary, 0x003938373635003332313031323334), + convert (image, 0x0066066697006606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066697066606669706660666970666066698), + convert (image, 0x0056334422), + convert (image, 0x0087342233), + convert (image, 0x0084352332) +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 3, + convert (binary, ''), + convert (varbinary, ''), + convert (image, ''), + convert (image, ''), + convert (image, ''), + convert (image, '') +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 4,null,null,null,null,null,null); +go + +-- =================================== END OBJECT BINARY_FAMILY ======================== + + +-- =================================== OBJECT STRING_FAMILY============================ +-- TABLE : string_family +-- data with id above 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'string_family' and type = 'U') + drop table string_family; +go + +create table string_family ( + id int PRIMARY KEY NOT NULL, + type_guid uniqueidentifier NULL, + type_char char(10) NULL, + type_nchar nchar(10) NULL, + type_varchar varchar(10) NULL, + type_nvarchar nvarchar(10) NULL, + type_text text NULL, + type_ntext ntext NULL); +go + +insert into string_family values (1, 'd222a130-6383-4d36-ac5e-4e6b2591aabf', 'char', N'nchभाr', 'varchar', N'nvभारतr', 'text', N'ntभाxt'); +insert into string_family values (2, '1c47dd1d-891b-47e8-aac8-f36608b31bc5', '0123456789', '0123456789', 'varchar ', N'nvभारतr ', 'longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext longtext ', N'ntभाxt '); +insert into string_family values (3, '3c47dd1d-891b-47e8-aac8-f36608b31bc5', '', '', '', '', '', ''); +insert into string_family values (4, null, null, null, null, null, null, null); +go +-- =================================== END OBJECT STRING_FAMILY ======================== + + +-- =================================== OBJECT DATETIME_FAMILY============================ +-- TABLE : datetime_family +-- data with id above 6000 is not gaurenteed to be read-only. + +if exists (select name from sysobjects where + name = 'datetime_family' and type = 'U') + drop table datetime_family; +go + +create table datetime_family ( + id int PRIMARY KEY NOT NULL, + type_smalldatetime smalldatetime NULL, + type_datetime datetime NULL); + +go +insert into datetime_family values (1,'2037-12-31 23:59:00','9999-12-31 23:59:59:997'); +insert into datetime_family values (4,null,null); +go + +-- =================================== END OBJECT DATETIME_FAMILY======================== + +-- =================================== OBJECT EMPLOYEE ============================ +-- TABLE : EMPLOYEE +-- data with id above 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'employee' and type = 'U') + drop table employee; +go + +create table employee ( + id int PRIMARY KEY NOT NULL, + fname varchar (50) NOT NULL, + lname varchar (50) NULL, + dob datetime NOT NULL, + doj datetime NOT NULL, + email varchar (50) NULL); +go + +insert into employee values (1, 'suresh', 'kumar', '1978-08-22', '2001-03-12', 'suresh@gmail.com'); +insert into employee values (2, 'ramesh', 'rajendran', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); +insert into employee values (3, 'venkat', 'ramakrishnan', '1977-06-12', '2003-12-11', 'ramesh@yahoo.com'); +insert into employee values (4, 'ramu', 'dhasarath', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com'); + +go + +-- STORED PROCEDURES + +-- SP : sp_clean_employee_table +if exists (select name from sysobjects where + name = 'sp_clean_employee_table' and type = 'P') + drop procedure sp_clean_employee_table; +go + +create procedure sp_clean_employee_table +as +begin + delete from employee where id > 6000; +end +go + +-- SP : sp_get_age +if exists (select name from sysobjects where + name = 'sp_get_age' and type = 'P') + drop procedure sp_get_age; +go + +create procedure sp_get_age ( + @fname varchar (50), + @age int output) +as +begin + select @age = datediff (day, dob, getdate ()) from employee where fname like @fname; + return @age; +end +go + +-- =================================== END OBJECT EMPLOYEE ============================ + +-- SP : sp_326182a +if exists (select name from sysobjects where + name = 'sp_326182a' and type = 'P') + drop procedure sp_326182a; +go + +CREATE procedure sp_326182a ( + @param0 int out, + @param1 int out, + @param2 int out, + @param3 int out) +as +begin + set @param0 = 100 + set @param1 = 101 + set @param2 = 102 + set @param3 = 103 + return 2 +end +go + +-- SP: sp_326182b + +if exists (select name from sysobjects where + name = 'sp_326182b' and type = 'P') + drop procedure sp_326182b; +go + +CREATE procedure sp_326182b ( + @param0 int = 9, + @param1 decimal (5, 2) out, + @param2 varchar (12)) +as +begin + set @param1 = (@param0 + @param1 + 2) + return 666 +end \ No newline at end of file diff --git a/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver7.sql b/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver7.sql new file mode 100644 index 0000000000..a7ad3e7368 Binary files /dev/null and b/mcs/class/System.Data/Test/ProviderTests/sql/sqlserver7.sql differ diff --git a/mcs/class/System.Data/Test/ProviderTests/sql/sybase.sql b/mcs/class/System.Data/Test/ProviderTests/sql/sybase.sql new file mode 100644 index 0000000000..4898e95ca0 --- /dev/null +++ b/mcs/class/System.Data/Test/ProviderTests/sql/sybase.sql @@ -0,0 +1,151 @@ +use monotest +go + +-- =================================== OBJECT EMPLOYEE ============================ +-- TABLE : INT_FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'numeric_family' and type = 'U') + drop table numeric_family +go + +create table numeric_family ( + id int PRIMARY KEY NOT NULL, + type_bit bit NOT NULL, + type_tinyint tinyint NULL, + type_smallint smallint NULL, + type_int int NULL, + type_bigint numeric (38,0) NULL, + type_decimal decimal (38, 0) NULL, + type_numeric numeric (38, 0) NULL, + type_money money NULL, + type_smallmoney smallmoney NULL) + +grant all on numeric_family to monotester +go + +insert into numeric_family values (1,1,255,32767,2147483647,9223372036854775807,1000,1000,922337203685477.5807,214748.3647) +insert into numeric_family values (2,0,0,-32768,-2147483648,-9223372036854775808,-1000,-1000,-922337203685477.5808,-214748.3648) +insert into numeric_family values (3,0,0,0,0,0,0,0,0,0) +insert into numeric_family values (4,0,null,null,null,null,null,null,null,null) +go + +-- =================================== END OBJECT EMPLOYEE ======================== + +-- =================================== OBJECT BINARY_FAMILY ========================= +-- TABLE : BINARY FAMILY +-- data with id > 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'binary_family' and type = 'U') + drop table binary_family +go + +create table binary_family ( + id int PRIMARY KEY NOT NULL, + type_binary binary (8) NULL, + type_varbinary varbinary (255) NULL, + type_blob image NULL, + type_tinyblob image NULL, + type_mediumblob image NULL, + type_longblob_image image NULL) + +grant all on binary_family to monotester +go + +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 1, + convert (binary, '5'), + convert (varbinary, '0123456789012345678901234567890123456789012345678901234567890123456789'), + convert (image, '66666666'), + convert (image, '777777'), + convert (image, '888888'), + convert (image, '999999') +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 2, + convert (binary, '03423051'), + convert (varbinary, '98765432101234'), + convert (image, '06666666'), + convert (image, '077077'), + convert (image, '088088'), + convert (image, '099099') +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 3, + convert (binary, ''), + convert (varbinary, ''), + convert (image, ''), + convert (image, ''), + convert (image, ''), + convert (image, '') +); +insert into binary_family (id, type_binary, type_varbinary, type_blob, type_tinyblob, type_mediumblob, type_longblob_image) values ( + 4,null,null,null,null,null,null); +go + +-- =================================== END OBJECT BINARY_FAMILY ======================== + + +-- =================================== OBJECT EMPLOYEE ============================ +-- TABLE : EMPLOYEE +-- data with id above 6000 is not gaurenteed to be read-only. +if exists (select name from sysobjects where + name = 'employee' and type = 'U') + drop table employee +go + +create table employee ( + id int PRIMARY KEY NOT NULL, + fname varchar (50) NOT NULL, + lname varchar (50) NULL, + dob datetime NOT NULL, + doj datetime NOT NULL, + email varchar (50) NULL) +go + +grant all privileges on employee to monotester + +insert into employee values (1, 'suresh', 'kumar', '1978-08-22', '2001-03-12', 'suresh@gmail.com') +insert into employee values (2, 'ramesh', 'rajendran', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com') +insert into employee values (3, 'venkat', 'ramakrishnan', '1977-06-12', '2003-12-11', 'ramesh@yahoo.com') +insert into employee values (4, 'ramu', 'dhasarath', '1977-02-15', '2005-02-11', 'ramesh@yahoo.com') +go + +-- STORED PROCEDURES +-- SP : sp_clean_employee_table +if exists (select name from sysobjects where + name = 'sp_clean_employee_table' and type = 'P') + drop procedure sp_clean_employee_table +go + +create procedure sp_clean_employee_table +as +begin + delete from employee where id > 6000 +end +go + +grant all on sp_clean_employee_table to monotester +go + +-- SP : sp_get_age +if exists (select name from sysobjects where + name = 'sp_get_age' and type = 'P') + drop procedure sp_get_age +go + +create procedure sp_get_age ( + @fname varchar (50), + @age int output) +as +begin + select @age = datediff (day, dob, getdate ()) from employee where fname like @fname + return @age +end +go + +grant all on sp_get_age to monotester +go + + +-- =================================== END OBJECT EMPLOYEE ============================ diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs index 0e740c9d35..9e03b6c424 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs @@ -26,6 +26,8 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#if !NO_ODBC + using System; using System.Data; using System.Data.Common; @@ -406,3 +408,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs index a766cdfff2..21e149e2ac 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System; using System.Data; using System.Data.Odbc; @@ -423,3 +425,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs index ba1a851dc0..0e476dec19 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs @@ -29,6 +29,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#if !NO_ODBC using System; using System.Collections; using System.Data; @@ -831,3 +832,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs index 66f2332210..7c353bc2ec 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System; using System.Data; using System.Data.Odbc; @@ -229,3 +231,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs index 40055d72da..e06add5687 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System; using System.Data; using System.Data.Odbc; @@ -488,3 +490,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs index 45ee486ce7..e3c97ae327 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System.Data.Odbc; using NUnit.Framework; @@ -47,3 +49,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs index ad78468841..17d7086abf 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System; using System.Text; using System.Data; @@ -78,3 +80,5 @@ namespace MonoTests.System.Data.Odbc } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs index 73d2652d85..2de9c0705e 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs @@ -28,6 +28,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using System; using System.Text; using System.Data; @@ -68,3 +70,5 @@ namespace MonoTests.System.Data.Odbc } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs index d8f5c5368d..c897588470 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using NUnit.Framework; using System; using System.Data; @@ -171,3 +173,5 @@ namespace MonoTests.System.Data.Odbc { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs index 453d171e5a..41953b2062 100644 --- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_ODBC + using NUnit.Framework; using System; using System.Data; @@ -116,3 +118,5 @@ namespace MonoTests.System.Data.Odbc { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs index 922458b7f1..fce89cd084 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB + using System.Data; using System.Data.OleDb; @@ -193,3 +195,5 @@ namespace MonoTests.System.Data.OleDb } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs index 4d2b0c4099..211c4cfffa 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs @@ -26,6 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB using System; using System.Data; using System.Data.OleDb; @@ -229,3 +230,5 @@ namespace MonoTests.System.Data.OleDb } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs index 3c906222d7..220c1b8c29 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs @@ -26,9 +26,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB + using System; using System.Data; +#if !NO_ODBC using System.Data.Odbc; +#endif using System.Data.OleDb; using NUnit.Framework; @@ -450,3 +454,5 @@ namespace MonoTests.System.Data.OleDb } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs index c1efd39735..6becd048ee 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB + using System.Data.OleDb; using NUnit.Framework; @@ -49,3 +51,5 @@ namespace MonoTests.System.Data.OleDb } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs index 0dfa75c3fc..37e83227df 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs @@ -27,6 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB using NUnit.Framework; using System; using System.Data; @@ -56,3 +57,5 @@ namespace MonoTests.System.Data.OleDb { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs index 22e213f016..53bf1953fb 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs @@ -27,6 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB using NUnit.Framework; using System; using System.Data; @@ -196,3 +197,5 @@ namespace MonoTests.System.Data.OleDb { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs index e1f3b325ab..742f73b835 100644 --- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NO_OLEDB + using NUnit.Framework; using System; using System.Data; @@ -129,3 +131,5 @@ namespace MonoTests.System.Data.OleDb { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/System.Data/Test/test-config-file b/mcs/class/System.Data/Test/test-config-file index 8135637f71..8da33c54a5 100644 --- a/mcs/class/System.Data/Test/test-config-file +++ b/mcs/class/System.Data/Test/test-config-file @@ -3,6 +3,7 @@ type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+
@@ -43,3 +44,42 @@ + + + + + + + + + + diff --git a/mcs/class/System.Data/corefx.common.sources b/mcs/class/System.Data/corefx.common.sources index bb0c8caa56..a7673c7761 100644 --- a/mcs/class/System.Data/corefx.common.sources +++ b/mcs/class/System.Data/corefx.common.sources @@ -24,7 +24,11 @@ ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbCommand.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnection.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionPoolKey.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbConnectionStringBuilder.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataAdapter.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReader.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataReaderExtensions.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataRecord.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbDataSourceEnumerator.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbEnumerator.cs @@ -33,18 +37,23 @@ ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbMetaDataColumnNames.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbParameter.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbParameterCollection.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderFactory.CreatePermission.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderFactory.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBSchemaRow.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DBSchemaTable.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DbTransaction.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DecimalStorage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/DoubleStorage.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/FieldNameLookup.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Groupbybehavior.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/IDbColumnSchemaGenerator.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/identifiercase.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int16Storage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int32Storage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/Int64Storage.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/MultipartIdentifier.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/Common/NameValuePair.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/ObjectStorage.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatedEventArgs.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/Common/RowUpdatingEventArgs.cs @@ -207,6 +216,7 @@ ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementCompletedEventArgs.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementCompletedEventHandler.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/StatementType.cs +../../../external/corefx/src/System.Data.Common/src/System/Data/StrongTypingException.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/UniqueConstraint.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/UpdateRowSource.cs ../../../external/corefx/src/System.Data.Common/src/System/Data/updatestatus.cs @@ -228,41 +238,38 @@ ../../../external/corefx/src/System.Data.Common/src/System/Xml/RegionIterator.cs ../../../external/corefx/src/System.Data.Common/src/System/Xml/TreeIterator.cs ../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlBoundElement.cs +../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataDocument.cs ../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataImplementation.cs ../../../external/corefx/src/System.Data.Common/src/System/Xml/XPathNodePointer.cs -../../../external/corefx/src/System.Data.Common/src/System/Xml/XmlDataDocument.cs - +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/Common/ActivityCorrelator.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/OperationAbortedException.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbReferenceCollection.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/TimeoutTimer.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/ApplicationIntent.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlError.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlErrorCollection.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlInfoMessageEvent.cs +../../../external/corefx/src/System.Private.Xml/src/Misc/HResults.cs ../referencesource/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs ../referencesource/System.Data/Misc/ExternDll.cs -../referencesource/System.Data/Misc/HResults.cs ../referencesource/System.Data/System/Data/CodeGen/StrongTypingException.cs -../referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs ../referencesource/System.Data/System/Data/Common/AdapterUtil.cs ../referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs -../referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs ../referencesource/System.Data/System/Data/Common/DBConnectionString.cs -../referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs ../referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs ../referencesource/System.Data/System/Data/Common/DBDataPermission.cs ../referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs -../referencesource/System.Data/System/Data/Common/DbDataReader.cs -../referencesource/System.Data/System/Data/Common/DbProviderFactory.cs -../referencesource/System.Data/System/Data/Common/FieldNameLookup.cs ../referencesource/System.Data/System/Data/Common/GreenMethods.cs -../referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs -../referencesource/System.Data/System/Data/Common/NameValuePair.cs ../referencesource/System.Data/System/Data/Common/NameValuePermission.cs ../referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs +../referencesource/System.Data/System/Data/DataSet.cs ../referencesource/System.Data/System/Data/OleDb/OleDbType.cs ../referencesource/System.Data/System/Data/OleDb/PropertyAttributes.cs -../referencesource/System.Data/System/Data/OperationAbortedException.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContext.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContextKey.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs -../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs ../referencesource/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs -../referencesource/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs -../referencesource/System.Data/System/Data/ProviderBase/TimeoutTimer.cs ../referencesource/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs ../referencesource/System.Data/System/Data/Sql/IBinarySerialize.cs ../referencesource/System.Data/System/Data/Sql/invalidudtexception.cs @@ -277,16 +284,11 @@ ../referencesource/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs ../referencesource/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs ../referencesource/System.Data/System/Data/Sql/TriggerAction.cs -../referencesource/System.Data/System/Data/SqlClient/ApplicationIntent.cs ../referencesource/System.Data/System/Data/SqlClient/LocalDBAPI.cs ../referencesource/System.Data/System/Data/SqlClient/SqlClientEncryptionType.cs ../referencesource/System.Data/System/Data/SqlClient/SqlClientPermission.cs ../referencesource/System.Data/System/Data/SqlClient/SqlConnectionString.cs ../referencesource/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs -../referencesource/System.Data/System/Data/SqlClient/SqlError.cs -../referencesource/System.Data/System/Data/SqlClient/SqlErrorCollection.cs -../referencesource/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs ../referencesource/System.Data/System/Data/SqlClient/SqlUtil.cs ../referencesource/System.Data/System/Data/SqlClient/TdsEnums.cs ../referencesource/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs -../referencesource/System.Data/System/Data/DataSet.cs diff --git a/mcs/class/System.Data/net_4_x_System.Data.dll.sources b/mcs/class/System.Data/net_4_x_System.Data.dll.sources index fd236c73f6..4977214850 100644 --- a/mcs/class/System.Data/net_4_x_System.Data.dll.sources +++ b/mcs/class/System.Data/net_4_x_System.Data.dll.sources @@ -160,7 +160,7 @@ System.Data.Common/DbConnectionStringBuilderHelper.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolCounters.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPool.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs -../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs +../../../external/corefx/src/System.Data.SqlClient/src/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs # ../referencesource/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs # ../referencesource/System.Data/System/Data/ProviderBase/DbParameterHelper.cs diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializer.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializer.cs index b3f8ec5e78..c4e3d6517d 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializer.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializer.cs @@ -101,47 +101,47 @@ namespace System.ComponentModel.Design.Serialization } public virtual CodeStatementCollection SerializeMember (IDesignerSerializationManager manager, - object owningobject, MemberDescriptor member) + object owningObject, MemberDescriptor member) { if (member == null) throw new ArgumentNullException ("member"); - if (owningobject == null) - throw new ArgumentNullException ("owningobject"); + if (owningObject == null) + throw new ArgumentNullException ("owningObject"); if (manager == null) throw new ArgumentNullException ("manager"); CodeStatementCollection statements = new CodeStatementCollection (); - CodeExpression expression = base.GetExpression (manager, owningobject); + CodeExpression expression = base.GetExpression (manager, owningObject); if (expression == null) { - string name = manager.GetName (owningobject); + string name = manager.GetName (owningObject); if (name == null) - name = base.GetUniqueName (manager, owningobject); + name = base.GetUniqueName (manager, owningObject); expression = new CodeVariableReferenceExpression (name); - base.SetExpression (manager, owningobject, expression); + base.SetExpression (manager, owningObject, expression); } if (member is PropertyDescriptor) - base.SerializeProperty (manager, statements, owningobject, (PropertyDescriptor) member); + base.SerializeProperty (manager, statements, owningObject, (PropertyDescriptor) member); if (member is EventDescriptor) - base.SerializeEvent (manager, statements, owningobject, (EventDescriptor) member); + base.SerializeEvent (manager, statements, owningObject, (EventDescriptor) member); return statements; } public virtual CodeStatementCollection SerializeMemberAbsolute (IDesignerSerializationManager manager, - object owningobject, MemberDescriptor member) + object owningObject, MemberDescriptor member) { if (member == null) throw new ArgumentNullException ("member"); - if (owningobject == null) - throw new ArgumentNullException ("owningobject"); + if (owningObject == null) + throw new ArgumentNullException ("owningObject"); if (manager == null) throw new ArgumentNullException ("manager"); SerializeAbsoluteContext context = new SerializeAbsoluteContext (member); manager.Context.Push (context); - CodeStatementCollection result = this.SerializeMember (manager, owningobject, member); + CodeStatementCollection result = this.SerializeMember (manager, owningObject, member); manager.Context.Pop (); return result; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerBase.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerBase.cs index 37a07439dc..46818dfa6c 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerBase.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerBase.cs @@ -67,18 +67,18 @@ namespace System.ComponentModel.Design.Serialization { } - protected CodeExpression SerializeToExpression (IDesignerSerializationManager manager, object instance) + protected CodeExpression SerializeToExpression (IDesignerSerializationManager manager, object value) { if (manager == null) throw new ArgumentNullException ("manager"); CodeExpression expression = null; - if (instance != null) - expression = this.GetExpression (manager, instance); // 1 - IDesignerSerializationManager.GetExpression + if (value != null) + expression = this.GetExpression (manager, value); // 1 - IDesignerSerializationManager.GetExpression if (expression == null) { - CodeDomSerializer serializer = this.GetSerializer (manager, instance); // 2 - manager.GetSerializer().Serialize() + CodeDomSerializer serializer = this.GetSerializer (manager, value); // 2 - manager.GetSerializer().Serialize() if (serializer != null) { - object serialized = serializer.Serialize (manager, instance); + object serialized = serializer.Serialize (manager, value); expression = serialized as CodeExpression; // 3 - CodeStatement or CodeStatementCollection if (expression == null) { CodeStatement statement = serialized as CodeStatement; @@ -88,8 +88,8 @@ namespace System.ComponentModel.Design.Serialization CodeStatementCollection contextStatements = null; StatementContext context = manager.Context[typeof (StatementContext)] as StatementContext; - if (context != null && instance != null) - contextStatements = context.StatementCollection[instance]; + if (context != null && value != null) + contextStatements = context.StatementCollection[value]; if (contextStatements == null) contextStatements = manager.Context[typeof (CodeStatementCollection)] as CodeStatementCollection; @@ -102,25 +102,25 @@ namespace System.ComponentModel.Design.Serialization } } } - if (expression == null && instance != null) - expression = this.GetExpression (manager, instance); // 4 + if (expression == null && value != null) + expression = this.GetExpression (manager, value); // 4 } else { - ReportError (manager, "No serializer found for type '" + instance.GetType ().Name + "'"); + ReportError (manager, "No serializer found for type '" + value.GetType ().Name + "'"); } } return expression; } - protected CodeDomSerializer GetSerializer (IDesignerSerializationManager manager, object instance) + protected CodeDomSerializer GetSerializer (IDesignerSerializationManager manager, object value) { DesignerSerializerAttribute attrInstance, attrType; attrType = attrInstance = null; CodeDomSerializer serializer = null; - if (instance == null) + if (value == null) serializer = this.GetSerializer (manager, null); else { - AttributeCollection attributes = TypeDescriptor.GetAttributes (instance); + AttributeCollection attributes = TypeDescriptor.GetAttributes (value); foreach (Attribute a in attributes) { DesignerSerializerAttribute designerAttr = a as DesignerSerializerAttribute; if (designerAttr != null && manager.GetType (designerAttr.SerializerBaseTypeName) == typeof (CodeDomSerializer)) { @@ -129,7 +129,7 @@ namespace System.ComponentModel.Design.Serialization } } - attributes = TypeDescriptor.GetAttributes (instance.GetType ()); + attributes = TypeDescriptor.GetAttributes (value.GetType ()); foreach (Attribute a in attributes) { DesignerSerializerAttribute designerAttr = a as DesignerSerializerAttribute; if (designerAttr != null && manager.GetType (designerAttr.SerializerBaseTypeName) == typeof (CodeDomSerializer)) { @@ -143,47 +143,47 @@ namespace System.ComponentModel.Design.Serialization if (attrType != null && attrInstance != null && attrType.SerializerTypeName != attrInstance.SerializerTypeName) serializer = Activator.CreateInstance (manager.GetType (attrInstance.SerializerTypeName)) as CodeDomSerializer; else - serializer = this.GetSerializer (manager, instance.GetType ()); + serializer = this.GetSerializer (manager, value.GetType ()); } return serializer; } - protected CodeDomSerializer GetSerializer (IDesignerSerializationManager manager, Type instanceType) + protected CodeDomSerializer GetSerializer (IDesignerSerializationManager manager, Type valueType) { - return manager.GetSerializer (instanceType, typeof (CodeDomSerializer)) as CodeDomSerializer; + return manager.GetSerializer (valueType, typeof (CodeDomSerializer)) as CodeDomSerializer; } - protected CodeExpression GetExpression (IDesignerSerializationManager manager, object instance) + protected CodeExpression GetExpression (IDesignerSerializationManager manager, object value) { if (manager == null) throw new ArgumentNullException ("manager"); - if (instance == null) - throw new ArgumentNullException ("instance"); + if (value == null) + throw new ArgumentNullException ("value"); CodeExpression expression = null; ExpressionTable expressions = manager.Context[typeof (ExpressionTable)] as ExpressionTable; if (expressions != null) // 1st try: ExpressionTable - expression = expressions [instance] as CodeExpression; + expression = expressions [value] as CodeExpression; if (expression == null) { // 2nd try: RootContext RootContext context = manager.Context[typeof (RootContext)] as RootContext; - if (context != null && context.Value == instance) + if (context != null && context.Value == value) expression = context.Expression; } if (expression == null) { // 3rd try: IReferenceService (instance.property.property.property - string name = manager.GetName (instance); + string name = manager.GetName (value); if (name == null || name.IndexOf (".") == -1) { IReferenceService service = manager.GetService (typeof (IReferenceService)) as IReferenceService; if (service != null) { - name = service.GetName (instance); + name = service.GetName (value); if (name != null && name.IndexOf (".") != -1) { string[] parts = name.Split (new char[] { ',' }); - instance = manager.GetInstance (parts[0]); - if (instance != null) { - expression = SerializeToExpression (manager, instance); + value = manager.GetInstance (parts[0]); + if (value != null) { + expression = SerializeToExpression (manager, value); if (expression != null) { for (int i=1; i < parts.Length; i++) expression = new CodePropertyReferenceExpression (expression, parts[i]); @@ -196,19 +196,19 @@ namespace System.ComponentModel.Design.Serialization return expression; } - protected void SetExpression (IDesignerSerializationManager manager, object instance, CodeExpression expression) + protected void SetExpression (IDesignerSerializationManager manager, object value, CodeExpression expression) { - SetExpression (manager, instance, expression, false); + SetExpression (manager, value, expression, false); } // XXX: isPreset - what does this do when set? // - protected void SetExpression (IDesignerSerializationManager manager, object instance, CodeExpression expression, bool isPreset) + protected void SetExpression (IDesignerSerializationManager manager, object value, CodeExpression expression, bool isPreset) { if (manager == null) throw new ArgumentNullException ("manager"); - if (instance == null) - throw new ArgumentNullException ("instance"); + if (value == null) + throw new ArgumentNullException ("value"); if (expression == null) throw new ArgumentNullException ("expression"); @@ -218,7 +218,7 @@ namespace System.ComponentModel.Design.Serialization manager.Context.Append (expressions); } - expressions[instance] = expression; + expressions[value] = expression; } protected bool IsSerialized (IDesignerSerializationManager manager, object value) @@ -227,14 +227,14 @@ namespace System.ComponentModel.Design.Serialization } // XXX: What should honorPreset do? - protected bool IsSerialized (IDesignerSerializationManager manager, object instance, bool honorPreset) + protected bool IsSerialized (IDesignerSerializationManager manager, object value, bool honorPreset) { - if (instance == null) - throw new ArgumentNullException ("instance"); + if (value == null) + throw new ArgumentNullException ("value"); if (manager == null) throw new ArgumentNullException ("manager"); - if (this.GetExpression (manager, instance) != null) + if (this.GetExpression (manager, value) != null) return true; else return false; @@ -390,20 +390,20 @@ namespace System.ComponentModel.Design.Serialization return manager.CreateInstance (type, parameters, name, addToContainer); } - protected string GetUniqueName (IDesignerSerializationManager manager, object instance) + protected string GetUniqueName (IDesignerSerializationManager manager, object value) { - if (instance == null) - throw new ArgumentNullException ("instance"); + if (value == null) + throw new ArgumentNullException ("value"); if (manager == null) throw new ArgumentNullException ("manager"); - string name = manager.GetName (instance); + string name = manager.GetName (value); if (name == null) { INameCreationService service = manager.GetService (typeof (INameCreationService)) as INameCreationService; - name = service.CreateName (null, instance.GetType ()); + name = service.CreateName (null, value.GetType ()); if (name == null) - name = instance.GetType ().Name.ToLower (); - manager.SetName (instance, name); + name = value.GetType ().Name.ToLower (); + manager.SetName (value, name); } return name; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/DesignerSerializationManager.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/DesignerSerializationManager.cs index 777d9ed18b..937fb3b0e7 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/DesignerSerializationManager.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/DesignerSerializationManager.cs @@ -220,7 +220,7 @@ namespace System.ComponentModel.Design.Serialization return instance; } - public object GetSerializer (Type componentType, Type serializerType) + public object GetSerializer (Type objectType, Type serializerType) { VerifyInSession (); @@ -229,17 +229,17 @@ namespace System.ComponentModel.Design.Serialization object serializer = null; - if (componentType != null) { + if (objectType != null) { // try 1: from cache // - _serializersCache.TryGetValue (componentType, out serializer); + _serializersCache.TryGetValue (objectType, out serializer); // check for provider attribute and add it to the list of providers // if (serializer != null && !serializerType.IsAssignableFrom (serializer.GetType ())) serializer = null; - AttributeCollection attributes = TypeDescriptor.GetAttributes (componentType); + AttributeCollection attributes = TypeDescriptor.GetAttributes (objectType); DefaultSerializationProviderAttribute providerAttribute = attributes[typeof (DefaultSerializationProviderAttribute)] as DefaultSerializationProviderAttribute; if (providerAttribute != null && this.GetType (providerAttribute.ProviderTypeName) == serializerType) { @@ -252,8 +252,8 @@ namespace System.ComponentModel.Design.Serialization // try 2: DesignerSerializerAttribute // - if (serializer == null && componentType != null) { - AttributeCollection attributes = TypeDescriptor.GetAttributes (componentType); + if (serializer == null && objectType != null) { + AttributeCollection attributes = TypeDescriptor.GetAttributes (objectType); DesignerSerializerAttribute serializerAttribute = attributes[typeof (DesignerSerializerAttribute)] as DesignerSerializerAttribute; if (serializerAttribute != null && this.GetType (serializerAttribute.SerializerBaseTypeName) == serializerType) { @@ -266,14 +266,14 @@ namespace System.ComponentModel.Design.Serialization } if (serializer != null) - _serializersCache[componentType] = serializer; + _serializersCache[objectType] = serializer; } // try 3: from provider // if (serializer == null && _serializationProviders != null) { foreach (IDesignerSerializationProvider provider in _serializationProviders) { - serializer = provider.GetSerializer (this, null, componentType, serializerType); + serializer = provider.GetSerializer (this, null, objectType, serializerType); if (serializer != null) break; } @@ -332,19 +332,19 @@ namespace System.ComponentModel.Design.Serialization _serializationCompleteHandler (this, EventArgs.Empty); } - protected virtual Type GetType (string name) + protected virtual Type GetType (string typeName) { - if (name == null) - throw new ArgumentNullException ("name"); + if (typeName == null) + throw new ArgumentNullException ("typeName"); this.VerifyInSession (); Type result = null; ITypeResolutionService typeResSvc = this.GetService (typeof (ITypeResolutionService)) as ITypeResolutionService; if (typeResSvc != null) - result = typeResSvc.GetType (name); + result = typeResSvc.GetType (typeName); if (result == null) - result = Type.GetType (name); + result = Type.GetType (typeName); return result; } @@ -491,16 +491,16 @@ namespace System.ComponentModel.Design.Serialization } #endregion - object IServiceProvider.GetService (Type service) + object IServiceProvider.GetService (Type serviceType) { - return this.GetService (service); + return this.GetService (serviceType); } - protected virtual object GetService (Type service) + protected virtual object GetService (Type serviceType) { object result = null; if (_serviceProvider != null) - result = _serviceProvider.GetService (service); + result = _serviceProvider.GetService (serviceType); return result; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/ObjectStatementCollection.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/ObjectStatementCollection.cs index 1961d840d7..5712ddc249 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/ObjectStatementCollection.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/ObjectStatementCollection.cs @@ -54,9 +54,9 @@ namespace System.ComponentModel.Design.Serialization return _statements.GetEnumerator (); } - public CodeStatementCollection this[object owner] + public CodeStatementCollection this[object statementOwner] { - get { return _statements[owner] as CodeStatementCollection; } + get { return _statements[statementOwner] as CodeStatementCollection; } } IEnumerator IEnumerable.GetEnumerator() diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/RootContext.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/RootContext.cs index 77f284dad4..a476a2ab6b 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/RootContext.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/RootContext.cs @@ -40,13 +40,13 @@ namespace System.ComponentModel.Design.Serialization CodeExpression _expression; object _value; - public RootContext (CodeExpression expresion, object value) + public RootContext (CodeExpression expression, object value) { - if (expresion == null) + if (expression == null) throw new ArgumentNullException ("expression"); if (value == null) throw new ArgumentNullException ("value"); - _expression = expresion; + _expression = expression; _value = value; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs b/mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs index 4362e35f11..45b11116cc 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs @@ -408,10 +408,10 @@ namespace System.ComponentModel.Design // Helper method - not an ISerivceProvider // - protected virtual object GetService (Type service) + protected virtual object GetService (Type serviceType) { if (_component != null && _component.Site != null) - return _component.Site.GetService (service); + return _component.Site.GetService (serviceType); return null; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs index 38d1a604c0..0a0d674741 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs @@ -73,9 +73,9 @@ namespace System.ComponentModel.Design { } - public DesignSurfaceManager (IServiceProvider serviceProvider) + public DesignSurfaceManager (IServiceProvider parentProvider) { - _parentProvider = serviceProvider; + _parentProvider = parentProvider; this.ServiceContainer.AddService (typeof (IDesignerEventService), new DesignerEventService ()); } @@ -224,10 +224,10 @@ namespace System.ComponentModel.Design } - public object GetService (Type service) + public object GetService (Type serviceType) { if (_serviceContainer != null) - return _serviceContainer.GetService (service); + return _serviceContainer.GetService (serviceType); return null; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design/EventBindingService.cs b/mcs/class/System.Design/System.ComponentModel.Design/EventBindingService.cs index 3eb602c5b1..c2f5535b9a 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design/EventBindingService.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design/EventBindingService.cs @@ -50,8 +50,8 @@ namespace System.ComponentModel.Design protected abstract bool ShowCode (IComponent component, EventDescriptor e, string methodName); protected abstract bool ShowCode (int lineNumber); protected abstract bool ShowCode (); - protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor eventDescriptor); - protected abstract ICollection GetCompatibleMethods (EventDescriptor eventDescriptor); + protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor e); + protected abstract ICollection GetCompatibleMethods (EventDescriptor e); protected virtual void FreeMethod (IComponent component, EventDescriptor e, string methodName) { @@ -67,10 +67,10 @@ namespace System.ComponentModel.Design } - protected object GetService (Type service) + protected object GetService (Type serviceType) { if (_provider != null) - return _provider.GetService (service); + return _provider.GetService (serviceType); return null; } diff --git a/mcs/class/System.Design/System.ComponentModel.Design/MenuCommandService.cs b/mcs/class/System.Design/System.ComponentModel.Design/MenuCommandService.cs index cb6f015cf1..8a4e797d99 100644 --- a/mcs/class/System.Design/System.ComponentModel.Design/MenuCommandService.cs +++ b/mcs/class/System.Design/System.ComponentModel.Design/MenuCommandService.cs @@ -210,12 +210,12 @@ namespace System.ComponentModel.Design return false; } - public virtual bool GlobalInvoke (CommandID commandID, object arg) + public virtual bool GlobalInvoke (CommandID commandId, object arg) { - if (commandID == null) - throw new ArgumentNullException ("commandID"); + if (commandId == null) + throw new ArgumentNullException ("commandId"); - MenuCommand command = this.FindCommand (commandID); + MenuCommand command = this.FindCommand (commandId); if (command != null) { command.Invoke (arg); return true; diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetGeneratorException.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetGeneratorException.cs index 61cd66cea5..f442854a3f 100644 --- a/mcs/class/System.Design/System.Data.Design/TypedDataSetGeneratorException.cs +++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetGeneratorException.cs @@ -66,12 +66,12 @@ namespace System.Data.Design { errorList.Add (info.GetString("KEY_ARRAYVALUES" + i)); } - public TypedDataSetGeneratorException (String error) : base (error) + public TypedDataSetGeneratorException (String message) : base (message) { } - public TypedDataSetGeneratorException (String error, Exception inner) - : base (error, inner) + public TypedDataSetGeneratorException (String message, Exception innerException) + : base (message, innerException) { } #endregion //Constructors @@ -82,15 +82,15 @@ namespace System.Data.Design { #region Methods - public override void GetObjectData (SerializationInfo si, StreamingContext context) + public override void GetObjectData (SerializationInfo info, StreamingContext context) { - base.GetObjectData (si, context); + base.GetObjectData (info, context); int count = (errorList != null) ? ErrorList.Count : 0; - si.AddValue ("KEY_ARRAYCOUNT", count); + info.AddValue ("KEY_ARRAYCOUNT", count); for (int i=0; i < count; i++) - si.AddValue("KEY_ARRAYVALUES" + i, ErrorList [i]); + info.AddValue("KEY_ARRAYVALUES" + i, ErrorList [i]); } #endregion // Methods diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListComponentEditor.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListComponentEditor.cs index 5fba73eab9..8b2b9d60fc 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListComponentEditor.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListComponentEditor.cs @@ -35,9 +35,9 @@ namespace System.Web.UI.Design.WebControls { { int initial_page; - public BaseDataListComponentEditor (int initial_page) + public BaseDataListComponentEditor (int initialPage) { - this.initial_page = initial_page; + this.initial_page = initialPage; } public override bool EditComponent ( diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListDesigner.cs index 22f9b85c03..5e9a0f2653 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListDesigner.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/BaseDataListDesigner.cs @@ -74,16 +74,16 @@ namespace System.Web.UI.Design.WebControls { } protected IEnumerable GetDesignTimeDataSource ( - int minimum_rows, - out bool dummy_data_source) + int minimumRows, + out bool dummyDataSource) { throw new NotImplementedException (); } protected IEnumerable GetDesignTimeDataSource ( - IEnumerable selected_data_source, - int minimum_rows, - out bool dummy_data_source) + IEnumerable selectedDataSource, + int minimumRows, + out bool dummyDataSource) { throw new NotImplementedException (); } @@ -98,7 +98,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - public override IEnumerable GetTemplateContainerDataSource (string template_name) + public override IEnumerable GetTemplateContainerDataSource (string templateName) { throw new NotImplementedException (); } @@ -108,7 +108,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - protected internal void InvokePropertyBuilder (int initial_page) + protected internal void InvokePropertyBuilder (int initialPage) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/DataListComponentEditor.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/DataListComponentEditor.cs index 59bdb670f4..96f54b622f 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/DataListComponentEditor.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/DataListComponentEditor.cs @@ -38,8 +38,8 @@ namespace System.Web.UI.Design.WebControls { { } - public DataListComponentEditor (int initial_page) - : base (initial_page) + public DataListComponentEditor (int initialPage) + : base (initialPage) { } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDataBindingHandler.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDataBindingHandler.cs index 3442c86eea..755dadcca3 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDataBindingHandler.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDataBindingHandler.cs @@ -38,7 +38,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - public override void DataBindControl (IDesignerHost designer_host, Control control) + public override void DataBindControl (IDesignerHost designerHost, Control control) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/PanelDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/PanelDesigner.cs index 918b650f1a..4e057a6adb 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/PanelDesigner.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/PanelDesigner.cs @@ -37,7 +37,7 @@ namespace System.Web.UI.Design.WebControls { { } - protected override void MapPropertyToStyle (string name, object value) + protected override void MapPropertyToStyle (string propName, object varPropValue) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/RepeaterDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/RepeaterDesigner.cs index 8f6314559c..81d53cbca2 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/RepeaterDesigner.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/RepeaterDesigner.cs @@ -63,14 +63,14 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - protected IEnumerable GetDesignTimeDataSource (int minimum_rows) + protected IEnumerable GetDesignTimeDataSource (int minimumRows) { throw new NotImplementedException (); } protected IEnumerable GetDesignTimeDataSource ( - IEnumerable selected_data_source, - int minimum_rows) + IEnumerable selectedDataSource, + int minimumRows) { throw new NotImplementedException (); } @@ -105,7 +105,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - public override void OnComponentChanged (object sender, ComponentChangedEventArgs e) + public override void OnComponentChanged (object source, ComponentChangedEventArgs ce) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableCellsCollectionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableCellsCollectionEditor.cs index 4cbd0cefcd..dc949952f9 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableCellsCollectionEditor.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableCellsCollectionEditor.cs @@ -42,7 +42,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - protected override object CreateInstance (Type item_type) + protected override object CreateInstance (Type itemType) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableRowsCollectionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableRowsCollectionEditor.cs index 1961b98f07..c7865dcf91 100644 --- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableRowsCollectionEditor.cs +++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/TableRowsCollectionEditor.cs @@ -42,7 +42,7 @@ namespace System.Web.UI.Design.WebControls { throw new NotImplementedException (); } - protected override object CreateInstance (Type item_type) + protected override object CreateInstance (Type itemType) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/ComponentTray.cs b/mcs/class/System.Design/System.Windows.Forms.Design/ComponentTray.cs index 970390e629..5efc9c963f 100644 --- a/mcs/class/System.Design/System.Windows.Forms.Design/ComponentTray.cs +++ b/mcs/class/System.Design/System.Windows.Forms.Design/ComponentTray.cs @@ -235,10 +235,10 @@ namespace System.Windows.Forms.Design return false; } - protected override object GetService (Type service) + protected override object GetService (Type serviceType) { if (_serviceProvider != null) { - return _serviceProvider.GetService (service); + return _serviceProvider.GetService (serviceType); } return null; } diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/ControlDesigner.cs b/mcs/class/System.Design/System.Windows.Forms.Design/ControlDesigner.cs index 2eefad53d0..10641f4d37 100644 --- a/mcs/class/System.Design/System.Windows.Forms.Design/ControlDesigner.cs +++ b/mcs/class/System.Design/System.Windows.Forms.Design/ControlDesigner.cs @@ -554,19 +554,19 @@ namespace System.Windows.Forms.Design #region Parenting - protected void HookChildControls (Control firstControl) + protected void HookChildControls (Control firstChild) { - if (firstControl != null) { - foreach (Control control in firstControl.Controls) { + if (firstChild != null) { + foreach (Control control in firstChild.Controls) { control.WindowTarget = (IWindowTarget) new WndProcRouter (control, (IMessageReceiver) this); } } } - protected void UnhookChildControls (Control firstControl) + protected void UnhookChildControls (Control firstChild) { - if (firstControl != null) { - foreach (Control control in firstControl.Controls) { + if (firstChild != null) { + foreach (Control control in firstChild.Controls) { if (control.WindowTarget is WndProcRouter) ((WndProcRouter) control.WindowTarget).Dispose (); } @@ -662,11 +662,11 @@ namespace System.Windows.Forms.Design e.UseDefaultCursors = false; } - protected virtual void OnDragDrop (DragEventArgs e) + protected virtual void OnDragDrop (DragEventArgs de) { } - protected virtual void OnDragEnter (DragEventArgs e) + protected virtual void OnDragEnter (DragEventArgs de) { } @@ -674,7 +674,7 @@ namespace System.Windows.Forms.Design { } - protected virtual void OnDragOver (DragEventArgs e) + protected virtual void OnDragOver (DragEventArgs de) { } #endregion diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/DocumentDesigner.cs b/mcs/class/System.Design/System.Windows.Forms.Design/DocumentDesigner.cs index 6d369dfc4f..365ba61c7f 100644 --- a/mcs/class/System.Design/System.Windows.Forms.Design/DocumentDesigner.cs +++ b/mcs/class/System.Design/System.Windows.Forms.Design/DocumentDesigner.cs @@ -494,9 +494,9 @@ namespace System.Windows.Forms.Design // component - The IComponent to ensure has a context menu service. // XXX: Not sure exactly what this should do... // - protected virtual void EnsureMenuEditorService (IComponent component) + protected virtual void EnsureMenuEditorService (IComponent c) { - if (this.menuEditorService == null && component is ContextMenu) + if (this.menuEditorService == null && c is ContextMenu) menuEditorService = (IMenuEditorService) GetService (typeof (IMenuEditorService)); } #endregion diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/ParentControlDesigner.cs b/mcs/class/System.Design/System.Windows.Forms.Design/ParentControlDesigner.cs index 469bcd6732..eb53ae4bc5 100644 --- a/mcs/class/System.Design/System.Windows.Forms.Design/ParentControlDesigner.cs +++ b/mcs/class/System.Design/System.Windows.Forms.Design/ParentControlDesigner.cs @@ -210,23 +210,23 @@ namespace System.Windows.Forms.Design return false; } - public virtual bool CanParent (ControlDesigner designer) + public virtual bool CanParent (ControlDesigner controlDesigner) { - return CanParent (designer.Control); + return CanParent (controlDesigner.Control); } - protected override void OnDragDrop (DragEventArgs e) + protected override void OnDragDrop (DragEventArgs de) { IUISelectionService selectionServ = this.GetService (typeof (IUISelectionService)) as IUISelectionService; if (selectionServ != null) { // once this is fired the parent control (parentcontroldesigner) will start getting dragover events. // - Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (e.X, e.Y))); + Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (de.X, de.Y))); selectionServ.DragDrop (false, this.Control, location.X, location.Y); } } - protected override void OnDragEnter (DragEventArgs e) + protected override void OnDragEnter (DragEventArgs de) { this.Control.Refresh (); } @@ -236,16 +236,16 @@ namespace System.Windows.Forms.Design this.Control.Refresh (); } - protected override void OnDragOver (DragEventArgs e) + protected override void OnDragOver (DragEventArgs de) { IUISelectionService selectionServ = this.GetService (typeof (IUISelectionService)) as IUISelectionService; if (selectionServ != null) { // once ControlDesigner.MouseDragBegin is called this will start getting dragover events. // - Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (e.X, e.Y))); + Point location = this.SnapPointToGrid (this.Control.PointToClient (new Point (de.X, de.Y))); selectionServ.DragOver (this.Control, location.X, location.Y); } - e.Effect = DragDropEffects.Move; + de.Effect = DragDropEffects.Move; } #endregion diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/ScrollableControlDesigner.cs b/mcs/class/System.Design/System.Windows.Forms.Design/ScrollableControlDesigner.cs index 266afd8f85..567d3ace15 100644 --- a/mcs/class/System.Design/System.Windows.Forms.Design/ScrollableControlDesigner.cs +++ b/mcs/class/System.Design/System.Windows.Forms.Design/ScrollableControlDesigner.cs @@ -51,9 +51,9 @@ namespace System.Windows.Forms.Design private const int HTHSCROLL = 6; private const int HTVSCROLL = 7; - protected override bool GetHitTest (Point point) + protected override bool GetHitTest (Point pt) { - if (base.GetHitTest (point)) { + if (base.GetHitTest (pt)) { return true; } @@ -65,7 +65,7 @@ namespace System.Windows.Forms.Design int hitTestResult = (int) Native.SendMessage (this.Control.Handle, Native.Msg.WM_NCHITTEST, IntPtr.Zero, - (IntPtr) Native.LParam (point.X, point.Y)); + (IntPtr) Native.LParam (pt.X, pt.Y)); if (hitTestResult == HTHSCROLL || hitTestResult == HTVSCROLL) return true; } diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs index 89cb057935..7d1a0abbb8 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs @@ -215,9 +215,9 @@ namespace System.DirectoryServices /// relative distinguised name of the child /// /// Child entry with the specified name - public DirectoryEntry Find(string filter) + public DirectoryEntry Find(string name) { - DirectoryEntry child=CheckEntry(filter); + DirectoryEntry child=CheckEntry(name); return child; } @@ -229,12 +229,12 @@ namespace System.DirectoryServices /// Type of the child i.e strutcuralObjectClass /// name of the child /// Child entry with the specified name and type - public DirectoryEntry Find(string filter, string otype) + public DirectoryEntry Find(string name, string schemaClassName) { - DirectoryEntry child=CheckEntry(filter); + DirectoryEntry child=CheckEntry(name); if( child != null) { - if(child.Properties["objectclass"].ContainsCaselessStringValue(otype)) + if(child.Properties["objectclass"].ContainsCaselessStringValue(schemaClassName)) return child; else throw new SystemException("An unknown directory object was requested"); diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs index d0d23937e2..1df7a9ba45 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs @@ -45,11 +45,11 @@ namespace System.DirectoryServices { SetUp (); } - public DirectoryServicesPermission (DirectoryServicesPermissionEntry[] entries) + public DirectoryServicesPermission (DirectoryServicesPermissionEntry[] permissionAccessEntries) { SetUp (); innerCollection = new DirectoryServicesPermissionEntryCollection (this); - innerCollection.AddRange (entries); + innerCollection.AddRange (permissionAccessEntries); } public DirectoryServicesPermission (PermissionState state) @@ -58,11 +58,11 @@ namespace System.DirectoryServices { SetUp (); } - public DirectoryServicesPermission (DirectoryServicesPermissionAccess access, string path) + public DirectoryServicesPermission (DirectoryServicesPermissionAccess permissionAccess, string path) { SetUp (); innerCollection = new DirectoryServicesPermissionEntryCollection (this); - innerCollection.Add (new DirectoryServicesPermissionEntry (access, path)); + innerCollection.Add (new DirectoryServicesPermissionEntry (permissionAccess, path)); } public DirectoryServicesPermissionEntryCollection PermissionEntries { diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs index 95c07b65f6..c413ea6d40 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs @@ -61,47 +61,47 @@ namespace System.DirectoryServices { set { List[index] = value; } } - public int Add (DirectoryServicesPermissionEntry entry) + public int Add (DirectoryServicesPermissionEntry value) { - return List.Add (entry); + return List.Add (value); } - public void AddRange (DirectoryServicesPermissionEntry[] entries) + public void AddRange (DirectoryServicesPermissionEntry[] value) { - foreach (DirectoryServicesPermissionEntry entry in entries) + foreach (DirectoryServicesPermissionEntry entry in value) Add (entry); } - public void AddRange (DirectoryServicesPermissionEntryCollection entries) + public void AddRange (DirectoryServicesPermissionEntryCollection value) { - foreach (DirectoryServicesPermissionEntry entry in entries) + foreach (DirectoryServicesPermissionEntry entry in value) Add (entry); } - public void CopyTo (DirectoryServicesPermissionEntry[] copy_to, int index) + public void CopyTo (DirectoryServicesPermissionEntry[] array, int index) { foreach (DirectoryServicesPermissionEntry entry in List) - copy_to[index++] = entry; + array[index++] = entry; } - public bool Contains (DirectoryServicesPermissionEntry entry) + public bool Contains (DirectoryServicesPermissionEntry value) { - return List.Contains (entry); + return List.Contains (value); } - public int IndexOf (DirectoryServicesPermissionEntry entry) + public int IndexOf (DirectoryServicesPermissionEntry value) { - return List.IndexOf (entry); + return List.IndexOf (value); } - public void Insert (int pos, DirectoryServicesPermissionEntry entry) + public void Insert (int index, DirectoryServicesPermissionEntry value) { - List.Insert (pos, entry); + List.Insert (index, value); } - public void Remove (DirectoryServicesPermissionEntry entry) + public void Remove (DirectoryServicesPermissionEntry value) { - List.Remove (entry); + List.Remove (value); } protected override void OnClear () diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs index 15089be8d5..5b7533e7bd 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs @@ -85,16 +85,16 @@ namespace System.DirectoryServices } - public void AddRange(object[] values) + public void AddRange(object[] value) { - foreach (object value in values) - Add (value); + foreach (object val in value) + Add (val); } - public void AddRange (PropertyValueCollection coll) + public void AddRange (PropertyValueCollection value) { - foreach (object value in coll) - Add (value); + foreach (object val in value) + Add (val); } public int IndexOf( object value ) @@ -132,10 +132,10 @@ namespace System.DirectoryServices return false; } - public void CopyTo (object[] copy_to, int index) + public void CopyTo (object[] array, int index) { foreach (object o in List) - copy_to[index++] = o; + array[index++] = o; } [MonoTODO] diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs index 2c7460276f..df35e21999 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs @@ -58,10 +58,10 @@ namespace System.DirectoryServices } - public ResultPropertyValueCollection this[string key] + public ResultPropertyValueCollection this[string name] { get { - return (ResultPropertyValueCollection) this.Dictionary[key.ToLower()]; + return (ResultPropertyValueCollection) this.Dictionary[name.ToLower()]; } // set { this.Dictionary[key] = value; } } @@ -72,9 +72,9 @@ namespace System.DirectoryServices } //see if collection contains an entry corresponding to key - public bool Contains(string key) + public bool Contains(string propertyName) { - return this.Dictionary.Contains(key.ToLower()); + return this.Dictionary.Contains(propertyName.ToLower()); } public ICollection PropertyNames @@ -93,10 +93,10 @@ namespace System.DirectoryServices } } - public void CopyTo (ResultPropertyValueCollection[] copy_to, int index) + public void CopyTo (ResultPropertyValueCollection[] array, int index) { foreach (ResultPropertyValueCollection vals in Values) - copy_to[index++] = vals; + array[index++] = vals; } } } diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs index 05b352889d..e270392709 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs @@ -74,9 +74,9 @@ namespace System.DirectoryServices return InnerList.Contains (value); } - public void CopyTo (object[] array, int index) + public void CopyTo (object[] values, int index) { - InnerList.CopyTo (array, index); + InnerList.CopyTo (values, index); } public int IndexOf (object value) diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs index 6b94d89070..2afb3bc8c6 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs @@ -158,19 +158,19 @@ namespace System.DirectoryServices } [MonoTODO] - public void AddRange (SchemaNameCollection coll) + public void AddRange (SchemaNameCollection value) { throw new NotImplementedException(); } [MonoTODO] - public void AddRange (string[] coll) + public void AddRange (string[] value) { throw new NotImplementedException(); } [MonoTODO] - public bool Contains (string s) + public bool Contains (string value) { throw new NotImplementedException(); } @@ -182,25 +182,25 @@ namespace System.DirectoryServices } [MonoTODO] - public void CopyTo (string[] copy_to, int pos) + public void CopyTo (string[] stringArray, int index) { throw new NotImplementedException(); } [MonoTODO] - public int IndexOf (string s) + public int IndexOf (string value) { throw new NotImplementedException(); } [MonoTODO] - public void Insert (int pos, string s) + public void Insert (int index, string value) { throw new NotImplementedException(); } [MonoTODO] - public void Remove (string s) + public void Remove (string value) { throw new NotImplementedException(); } diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile index ed78483330..1e704b38be 100644 --- a/mcs/class/System.Drawing/Makefile +++ b/mcs/class/System.Drawing/Makefile @@ -10,10 +10,12 @@ LIB_MCS_FLAGS = /unsafe \ -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \ -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -ifneq (winaot, $(PROFILE)) -LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -else +ifeq (winaot, $(PROFILE)) LIB_MCS_FLAGS += /keyfile:../msfinal.pub +else ifeq (orbis, $(PROFILE)) +LIB_MCS_FLAGS += /keyfile:../msfinal.pub +else +LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS endif TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml diff --git a/mcs/class/System.Drawing/System.Drawing.Design/CategoryNameCollection.cs b/mcs/class/System.Drawing/System.Drawing.Design/CategoryNameCollection.cs index 259b101978..7a0abfa2ee 100644 --- a/mcs/class/System.Drawing/System.Drawing.Design/CategoryNameCollection.cs +++ b/mcs/class/System.Drawing/System.Drawing.Design/CategoryNameCollection.cs @@ -33,11 +33,9 @@ // using System.Collections; -using System.Security.Permissions; namespace System.Drawing.Design { - [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] public sealed class CategoryNameCollection : ReadOnlyCollectionBase { diff --git a/mcs/class/System.Drawing/System.Drawing.Design/PaintValueEventArgs.cs b/mcs/class/System.Drawing/System.Drawing.Design/PaintValueEventArgs.cs index 1b7ba48f87..837f39bf18 100644 --- a/mcs/class/System.Drawing/System.Drawing.Design/PaintValueEventArgs.cs +++ b/mcs/class/System.Drawing/System.Drawing.Design/PaintValueEventArgs.cs @@ -30,12 +30,9 @@ // using System.ComponentModel; -using System.Security.Permissions; namespace System.Drawing.Design { - [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] - [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] public class PaintValueEventArgs : EventArgs { private ITypeDescriptorContext context; diff --git a/mcs/class/System.Drawing/System.Drawing.Design/PropertyValueItem.cs b/mcs/class/System.Drawing/System.Drawing.Design/PropertyValueItem.cs index ad6676f537..422728a143 100644 --- a/mcs/class/System.Drawing/System.Drawing.Design/PropertyValueItem.cs +++ b/mcs/class/System.Drawing/System.Drawing.Design/PropertyValueItem.cs @@ -32,12 +32,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System.Security.Permissions; - namespace System.Drawing.Design { - [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] - [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] public class PropertyValueUIItem { diff --git a/mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatedEventArgs.cs b/mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatedEventArgs.cs index 5d0684bdf1..f7969b9724 100644 --- a/mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatedEventArgs.cs +++ b/mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatedEventArgs.cs @@ -31,12 +31,9 @@ // using System.ComponentModel; -using System.Security.Permissions; namespace System.Drawing.Design { - [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] - [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] public class ToolboxComponentsCreatedEventArgs : EventArgs { private IComponent[] components; diff --git a/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditor.cs b/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditor.cs index 56ce1912fe..31f736a47b 100644 --- a/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditor.cs +++ b/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditor.cs @@ -30,13 +30,10 @@ // using System.ComponentModel; -using System.Security.Permissions; using System.Collections; namespace System.Drawing.Design { - [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] - [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] public class UITypeEditor { static UITypeEditor () diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPath.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPath.cs index 191fc387f4..dc747fdfb5 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPath.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPath.cs @@ -221,27 +221,27 @@ namespace System.Drawing.Drawing2D // // AddArc // - public void AddArc (Rectangle rect, float start_angle, float sweep_angle) + public void AddArc (Rectangle rect, float startAngle, float sweepAngle) { - Status status = GDIPlus.GdipAddPathArcI (nativePath, rect.X, rect.Y, rect.Width, rect.Height, start_angle, sweep_angle); + Status status = GDIPlus.GdipAddPathArcI (nativePath, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle); GDIPlus.CheckStatus (status); } - public void AddArc (RectangleF rect, float start_angle, float sweep_angle) + public void AddArc (RectangleF rect, float startAngle, float sweepAngle) { - Status status = GDIPlus.GdipAddPathArc (nativePath, rect.X, rect.Y, rect.Width, rect.Height, start_angle, sweep_angle); + Status status = GDIPlus.GdipAddPathArc (nativePath, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle); GDIPlus.CheckStatus (status); } - public void AddArc (int x, int y, int width, int height, float start_angle, float sweep_angle) + public void AddArc (int x, int y, int width, int height, float startAngle, float sweepAngle) { - Status status = GDIPlus.GdipAddPathArcI (nativePath, x, y, width, height, start_angle, sweep_angle); + Status status = GDIPlus.GdipAddPathArcI (nativePath, x, y, width, height, startAngle, sweepAngle); GDIPlus.CheckStatus (status); } - public void AddArc (float x, float y, float width, float height, float start_angle, float sweep_angle) + public void AddArc (float x, float y, float width, float height, float startAngle, float sweepAngle) { - Status status = GDIPlus.GdipAddPathArc (nativePath, x, y, width, height, start_angle, sweep_angle); + Status status = GDIPlus.GdipAddPathArc (nativePath, x, y, width, height, startAngle, sweepAngle); GDIPlus.CheckStatus (status); } @@ -279,28 +279,28 @@ namespace System.Drawing.Drawing2D // // AddBeziers // - public void AddBeziers (params Point [] pts) + public void AddBeziers (params Point [] points) { - if (pts == null) - throw new ArgumentNullException ("pts"); - Status status = GDIPlus.GdipAddPathBeziersI (nativePath, pts, pts.Length); + if (points == null) + throw new ArgumentNullException ("points"); + Status status = GDIPlus.GdipAddPathBeziersI (nativePath, points, points.Length); GDIPlus.CheckStatus (status); } - public void AddBeziers (PointF [] pts) + public void AddBeziers (PointF [] points) { - if (pts == null) - throw new ArgumentNullException ("pts"); - Status status = GDIPlus.GdipAddPathBeziers (nativePath, pts, pts.Length); + if (points == null) + throw new ArgumentNullException ("points"); + Status status = GDIPlus.GdipAddPathBeziers (nativePath, points, points.Length); GDIPlus.CheckStatus (status); } // // AddEllipse // - public void AddEllipse (RectangleF r) + public void AddEllipse (RectangleF rect) { - Status status = GDIPlus.GdipAddPathEllipse (nativePath, r.X, r.Y, r.Width, r.Height); + Status status = GDIPlus.GdipAddPathEllipse (nativePath, rect.X, rect.Y, rect.Width, rect.Height); GDIPlus.CheckStatus (status); } @@ -310,9 +310,9 @@ namespace System.Drawing.Drawing2D GDIPlus.CheckStatus (status); } - public void AddEllipse (Rectangle r) + public void AddEllipse (Rectangle rect) { - Status status = GDIPlus.GdipAddPathEllipseI (nativePath, r.X, r.Y, r.Width, r.Height); + Status status = GDIPlus.GdipAddPathEllipseI (nativePath, rect.X, rect.Y, rect.Width, rect.Height); GDIPlus.CheckStatus (status); } @@ -326,16 +326,16 @@ namespace System.Drawing.Drawing2D // // AddLine // - public void AddLine (Point a, Point b) + public void AddLine (Point pt1, Point pt2) { - Status status = GDIPlus.GdipAddPathLineI (nativePath, a.X, a.Y, b.X, b.Y); + Status status = GDIPlus.GdipAddPathLineI (nativePath, pt1.X, pt1.Y, pt2.X, pt2.Y); GDIPlus.CheckStatus (status); } - public void AddLine (PointF a, PointF b) + public void AddLine (PointF pt1, PointF pt2) { - Status status = GDIPlus.GdipAddPathLine (nativePath, a.X, a.Y, b.X, - b.Y); + Status status = GDIPlus.GdipAddPathLine (nativePath, pt1.X, pt1.Y, pt2.X, + pt2.Y); GDIPlus.CheckStatus (status); } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/HatchBrush.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/HatchBrush.cs index 024e0c2add..9c92b91caa 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/HatchBrush.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/HatchBrush.cs @@ -45,14 +45,14 @@ namespace System.Drawing.Drawing2D { } - public HatchBrush (HatchStyle hatchStyle, Color foreColor) - : this (hatchStyle, foreColor, Color.Black) + public HatchBrush (HatchStyle hatchstyle, Color foreColor) + : this (hatchstyle, foreColor, Color.Black) { } - public HatchBrush(HatchStyle hatchStyle, Color foreColor, Color backColor) + public HatchBrush(HatchStyle hatchstyle, Color foreColor, Color backColor) { - Status status = GDIPlus.GdipCreateHatchBrush (hatchStyle, foreColor.ToArgb (), backColor.ToArgb (), out nativeObject); + Status status = GDIPlus.GdipCreateHatchBrush (hatchstyle, foreColor.ToArgb (), backColor.ToArgb (), out nativeObject); GDIPlus.CheckStatus (status); } diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs index 3b042cad17..515362c99d 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs @@ -77,33 +77,33 @@ namespace System.Drawing.Imaging } [CLSCompliant(false)] - public ColorMatrix (float[][] matrix) + public ColorMatrix (float[][] newColorMatrix) { - color00 = matrix [0][0]; - color01 = matrix [0][1]; - color02 = matrix [0][2]; - color03 = matrix [0][3]; - color04 = matrix [0][4]; - color10 = matrix [1][0]; - color11 = matrix [1][1]; - color12 = matrix [1][2]; - color13 = matrix [1][3]; - color14 = matrix [1][4]; - color20 = matrix [2][0]; - color21 = matrix [2][1]; - color22 = matrix [2][2]; - color23 = matrix [2][3]; - color24 = matrix [2][4]; - color30 = matrix [3][0]; - color31 = matrix [3][1]; - color32 = matrix [3][2]; - color33 = matrix [3][3]; - color34 = matrix [3][4]; - color40 = matrix [4][0]; - color41 = matrix [4][1]; - color42 = matrix [4][2]; - color43 = matrix [4][3]; - color44 = matrix [4][4]; + color00 = newColorMatrix [0][0]; + color01 = newColorMatrix [0][1]; + color02 = newColorMatrix [0][2]; + color03 = newColorMatrix [0][3]; + color04 = newColorMatrix [0][4]; + color10 = newColorMatrix [1][0]; + color11 = newColorMatrix [1][1]; + color12 = newColorMatrix [1][2]; + color13 = newColorMatrix [1][3]; + color14 = newColorMatrix [1][4]; + color20 = newColorMatrix [2][0]; + color21 = newColorMatrix [2][1]; + color22 = newColorMatrix [2][2]; + color23 = newColorMatrix [2][3]; + color24 = newColorMatrix [2][4]; + color30 = newColorMatrix [3][0]; + color31 = newColorMatrix [3][1]; + color32 = newColorMatrix [3][2]; + color33 = newColorMatrix [3][3]; + color34 = newColorMatrix [3][4]; + color40 = newColorMatrix [4][0]; + color41 = newColorMatrix [4][1]; + color42 = newColorMatrix [4][2]; + color43 = newColorMatrix [4][3]; + color44 = newColorMatrix [4][4]; } // properties diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameter.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameter.cs index f21831faa4..8f19320aac 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameter.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameter.cs @@ -198,21 +198,21 @@ namespace System.Drawing.Imaging { } } - public EncoderParameter (Encoder encoder, int numberOfValues, int type, int value) + public EncoderParameter (Encoder encoder, int NumberOfValues, int Type, int Value) { this.encoder = encoder; - this.valuePtr = (IntPtr) value; - this.valuesCount = numberOfValues; - this.type = (EncoderParameterValueType) type; + this.valuePtr = (IntPtr) Value; + this.valuesCount = NumberOfValues; + this.type = (EncoderParameterValueType) Type; } - public EncoderParameter (Encoder encoder, int numerator1, int denominator1, int numerator2, int denominator2) + public EncoderParameter (Encoder encoder, int numerator1, int demoninator1, int numerator2, int demoninator2) { this.encoder = encoder; this.valuesCount = 1; this.type = EncoderParameterValueType.ValueTypeRationalRange; this.valuePtr = Marshal.AllocHGlobal (4 * 4); - int [] valuearray = { numerator1, denominator1, numerator2, denominator2 }; + int [] valuearray = { numerator1, demoninator1, numerator2, demoninator2 }; Marshal.Copy (valuearray, 0, this.valuePtr, 4); } diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.cs index 4bf494ea08..dbbf98d5fa 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.cs @@ -160,22 +160,22 @@ namespace System.Drawing.Imaging { SetColorKey (colorLow, colorHigh, ColorAdjustType.Default); } - public void SetColorMatrix (ColorMatrix colorMatrix) + public void SetColorMatrix (ColorMatrix newColorMatrix) { - SetColorMatrix (colorMatrix, ColorMatrixFlag.Default, ColorAdjustType.Default); + SetColorMatrix (newColorMatrix, ColorMatrixFlag.Default, ColorAdjustType.Default); } - public void SetColorMatrix (ColorMatrix colorMatrix, ColorMatrixFlag colorMatrixFlag) + public void SetColorMatrix (ColorMatrix newColorMatrix, ColorMatrixFlag flags) { - SetColorMatrix (colorMatrix, colorMatrixFlag, ColorAdjustType.Default); + SetColorMatrix (newColorMatrix, flags, ColorAdjustType.Default); } - public void SetColorMatrix (ColorMatrix colorMatrix, ColorMatrixFlag colorMatrixFlag, ColorAdjustType colorAdjustType) + public void SetColorMatrix (ColorMatrix newColorMatrix, ColorMatrixFlag mode, ColorAdjustType type) { - IntPtr cm = ColorMatrix.Alloc (colorMatrix); + IntPtr cm = ColorMatrix.Alloc (newColorMatrix); try { Status status = GDIPlus.GdipSetImageAttributesColorMatrix (nativeImageAttr, - colorAdjustType, true, cm, IntPtr.Zero, colorMatrixFlag); + type, true, cm, IntPtr.Zero, mode); GDIPlus.CheckStatus (status); } finally { @@ -294,9 +294,9 @@ namespace System.Drawing.Imaging { SetGamma (gamma, ColorAdjustType.Default); } - public void SetGamma (float gamma, ColorAdjustType coloradjust) + public void SetGamma (float gamma, ColorAdjustType type) { - Status status = GDIPlus.GdipSetImageAttributesGamma (nativeImageAttr, coloradjust, true, gamma); + Status status = GDIPlus.GdipSetImageAttributesGamma (nativeImageAttr, type, true, gamma); GDIPlus.CheckStatus (status); } diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs index 7498619e3c..b28654bae3 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs @@ -220,10 +220,10 @@ namespace System.Drawing.Imaging { } public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type, - string description) + string desc) { Status status = GDIPlus.GdipRecordMetafileI (referenceHdc, type, ref frameRect, frameUnit, - description, out nativeObject); + desc, out nativeObject); GDIPlus.CheckStatus (status); } @@ -261,8 +261,8 @@ namespace System.Drawing.Imaging { } public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, - string description) : this (fileName, referenceHdc, frameRect, frameUnit, EmfType.EmfPlusDual, - description) + string desc) : this (fileName, referenceHdc, frameRect, frameUnit, EmfType.EmfPlusDual, + desc) { } @@ -405,11 +405,11 @@ namespace System.Drawing.Imaging { } [MonoLimitation ("Metafiles aren't only partially supported by libgdiplus.")] - public static MetafileHeader GetMetafileHeader (IntPtr henhmetafile, WmfPlaceableFileHeader wmfHeader) + public static MetafileHeader GetMetafileHeader (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader) { IntPtr header = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (MetafileHeader))); try { - Status status = GDIPlus.GdipGetMetafileHeaderFromEmf (henhmetafile, header); + Status status = GDIPlus.GdipGetMetafileHeaderFromEmf (hmetafile, header); GDIPlus.CheckStatus (status); return new MetafileHeader (header); } diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/InvalidPrinterException.cs b/mcs/class/System.Drawing/System.Drawing.Printing/InvalidPrinterException.cs index 7fd1df9757..2257308637 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/InvalidPrinterException.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/InvalidPrinterException.cs @@ -31,7 +31,6 @@ // using System.Runtime.Serialization; -using System.Security.Permissions; namespace System.Drawing.Printing { @@ -50,7 +49,6 @@ namespace System.Drawing.Printing { { } - [SecurityPermission (SecurityAction.Demand, SerializationFormatter = true)] public override void GetObjectData (SerializationInfo info, StreamingContext context) { if (info == null) @@ -58,7 +56,7 @@ namespace System.Drawing.Printing { base.GetObjectData (info, context); } - + private static string GetMessage(PrinterSettings settings) { if (settings.PrinterName == null || settings.PrinterName == String.Empty) diff --git a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs index 6da3937e74..0b731a01f2 100644 --- a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs +++ b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs @@ -30,7 +30,6 @@ // using System.IO; -using System.Security.Permissions; using System.Runtime.InteropServices; namespace System.Drawing.Text { @@ -62,7 +61,6 @@ namespace System.Drawing.Text { GDIPlus.CheckStatus (status); } - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void AddMemoryFont (IntPtr memory, int length) { // note: MS throw FileNotFoundException if something is bad with the data (except for a null pointer) diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs index 8acb49bb0f..7a7d8c6895 100644 --- a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs +++ b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs @@ -37,10 +37,10 @@ using System.IO; using System.Drawing.Imaging; +using System.Reflection; using System.Runtime.Serialization; using System.Runtime.InteropServices; using System.ComponentModel; -using System.Security.Permissions; namespace System.Drawing { @@ -133,7 +133,11 @@ namespace System.Drawing if (resource == null) throw new ArgumentException ("resource"); - Stream s = type.Assembly.GetManifestResourceStream (type, resource); + // For compatibility with the .NET Framework + if (type == null) + throw new NullReferenceException(); + + Stream s = type.GetTypeInfo ().Assembly.GetManifestResourceStream (type, resource); if (s == null) { string msg = Locale.GetText ("Resource '{0}' was not found.", resource); throw new FileNotFoundException (msg); @@ -228,14 +232,12 @@ namespace System.Drawing } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public IntPtr GetHbitmap () { return GetHbitmap(Color.Gray); } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public IntPtr GetHbitmap (Color background) { IntPtr HandleBmp; @@ -247,7 +249,6 @@ namespace System.Drawing } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public IntPtr GetHicon () { IntPtr HandleIcon; diff --git a/mcs/class/System.Drawing/System.Drawing/BufferedGraphics.cs b/mcs/class/System.Drawing/System.Drawing/BufferedGraphics.cs index b2529ffe46..6d874797e0 100644 --- a/mcs/class/System.Drawing/System.Drawing/BufferedGraphics.cs +++ b/mcs/class/System.Drawing/System.Drawing/BufferedGraphics.cs @@ -30,7 +30,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; using System.Runtime.Serialization; -using System.Security.Permissions; namespace System.Drawing { @@ -106,7 +105,6 @@ namespace System.Drawing } [MonoTODO ("The targetDC parameter has no equivalent in libgdiplus.")] - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void Render (IntPtr targetDC) { throw new NotImplementedException (); diff --git a/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs b/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs index 92181609fa..721e00a98b 100644 --- a/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs +++ b/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs @@ -30,7 +30,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; using System.Runtime.Serialization; -using System.Security.Permissions; namespace System.Drawing { @@ -54,7 +53,6 @@ namespace System.Drawing } [MonoTODO ("The targetDC parameter has no equivalent in libgdiplus.")] - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public BufferedGraphics Allocate (IntPtr targetDC, Rectangle targetRectangle) { throw new NotImplementedException (); diff --git a/mcs/class/System.Drawing/System.Drawing/Color.cs b/mcs/class/System.Drawing/System.Drawing/Color.cs index 31b4842c84..2f317250e5 100644 --- a/mcs/class/System.Drawing/System.Drawing/Color.cs +++ b/mcs/class/System.Drawing/System.Drawing/Color.cs @@ -113,7 +113,7 @@ namespace System.Drawing // Optimization for known colors that were deserialized // from an MS serialized stream. if (value == 0 && IsKnownColor) { - value = KnownColors.FromKnownColor ((KnownColor)knownColor).ToArgb () & 0xFFFFFFFF; + value = FromKnownColor ((KnownColor)knownColor).ToArgb () & 0xFFFFFFFF; } return value; } @@ -151,14 +151,28 @@ namespace System.Drawing public static Color FromKnownColor (KnownColor color) { - return KnownColors.FromKnownColor (color); + Color c; + short n = (short)color; + if ((n <= 0) || (n >= KnownColors.ArgbValues.Length)) { + // This is what it returns! + c = FromArgb (0, 0, 0, 0); + c.state |= (short) ColorType.Named; + } else { + c = new Color (); + c.state = (short) (ColorType.ARGB | ColorType.Known | ColorType.Named); + if ((n < 27) || (n > 169)) + c.state |= (short) ColorType.System; + c.Value = KnownColors.ArgbValues [n]; + } + c.knownColor = n; + return c; } public static Color FromName (string name) { try { KnownColor kc = (KnownColor) Enum.Parse (typeof (KnownColor), name, true); - return KnownColors.FromKnownColor (kc); + return FromKnownColor (kc); } catch { // This is what it returns! @@ -422,567 +436,567 @@ namespace System.Drawing static public Color Transparent { - get { return KnownColors.FromKnownColor (KnownColor.Transparent); } + get { return FromKnownColor (KnownColor.Transparent); } } static public Color AliceBlue { - get { return KnownColors.FromKnownColor (KnownColor.AliceBlue); } + get { return FromKnownColor (KnownColor.AliceBlue); } } static public Color AntiqueWhite { - get { return KnownColors.FromKnownColor (KnownColor.AntiqueWhite); } + get { return FromKnownColor (KnownColor.AntiqueWhite); } } static public Color Aqua { - get { return KnownColors.FromKnownColor (KnownColor.Aqua); } + get { return FromKnownColor (KnownColor.Aqua); } } static public Color Aquamarine { - get { return KnownColors.FromKnownColor (KnownColor.Aquamarine); } + get { return FromKnownColor (KnownColor.Aquamarine); } } static public Color Azure { - get { return KnownColors.FromKnownColor (KnownColor.Azure); } + get { return FromKnownColor (KnownColor.Azure); } } static public Color Beige { - get { return KnownColors.FromKnownColor (KnownColor.Beige); } + get { return FromKnownColor (KnownColor.Beige); } } static public Color Bisque { - get { return KnownColors.FromKnownColor (KnownColor.Bisque); } + get { return FromKnownColor (KnownColor.Bisque); } } static public Color Black { - get { return KnownColors.FromKnownColor (KnownColor.Black); } + get { return FromKnownColor (KnownColor.Black); } } static public Color BlanchedAlmond { - get { return KnownColors.FromKnownColor (KnownColor.BlanchedAlmond); } + get { return FromKnownColor (KnownColor.BlanchedAlmond); } } static public Color Blue { - get { return KnownColors.FromKnownColor (KnownColor.Blue); } + get { return FromKnownColor (KnownColor.Blue); } } static public Color BlueViolet { - get { return KnownColors.FromKnownColor (KnownColor.BlueViolet); } + get { return FromKnownColor (KnownColor.BlueViolet); } } static public Color Brown { - get { return KnownColors.FromKnownColor (KnownColor.Brown); } + get { return FromKnownColor (KnownColor.Brown); } } static public Color BurlyWood { - get { return KnownColors.FromKnownColor (KnownColor.BurlyWood); } + get { return FromKnownColor (KnownColor.BurlyWood); } } static public Color CadetBlue { - get { return KnownColors.FromKnownColor (KnownColor.CadetBlue); } + get { return FromKnownColor (KnownColor.CadetBlue); } } static public Color Chartreuse { - get { return KnownColors.FromKnownColor (KnownColor.Chartreuse); } + get { return FromKnownColor (KnownColor.Chartreuse); } } static public Color Chocolate { - get { return KnownColors.FromKnownColor (KnownColor.Chocolate); } + get { return FromKnownColor (KnownColor.Chocolate); } } static public Color Coral { - get { return KnownColors.FromKnownColor (KnownColor.Coral); } + get { return FromKnownColor (KnownColor.Coral); } } static public Color CornflowerBlue { - get { return KnownColors.FromKnownColor (KnownColor.CornflowerBlue); } + get { return FromKnownColor (KnownColor.CornflowerBlue); } } static public Color Cornsilk { - get { return KnownColors.FromKnownColor (KnownColor.Cornsilk); } + get { return FromKnownColor (KnownColor.Cornsilk); } } static public Color Crimson { - get { return KnownColors.FromKnownColor (KnownColor.Crimson); } + get { return FromKnownColor (KnownColor.Crimson); } } static public Color Cyan { - get { return KnownColors.FromKnownColor (KnownColor.Cyan); } + get { return FromKnownColor (KnownColor.Cyan); } } static public Color DarkBlue { - get { return KnownColors.FromKnownColor (KnownColor.DarkBlue); } + get { return FromKnownColor (KnownColor.DarkBlue); } } static public Color DarkCyan { - get { return KnownColors.FromKnownColor (KnownColor.DarkCyan); } + get { return FromKnownColor (KnownColor.DarkCyan); } } static public Color DarkGoldenrod { - get { return KnownColors.FromKnownColor (KnownColor.DarkGoldenrod); } + get { return FromKnownColor (KnownColor.DarkGoldenrod); } } static public Color DarkGray { - get { return KnownColors.FromKnownColor (KnownColor.DarkGray); } + get { return FromKnownColor (KnownColor.DarkGray); } } static public Color DarkGreen { - get { return KnownColors.FromKnownColor (KnownColor.DarkGreen); } + get { return FromKnownColor (KnownColor.DarkGreen); } } static public Color DarkKhaki { - get { return KnownColors.FromKnownColor (KnownColor.DarkKhaki); } + get { return FromKnownColor (KnownColor.DarkKhaki); } } static public Color DarkMagenta { - get { return KnownColors.FromKnownColor (KnownColor.DarkMagenta); } + get { return FromKnownColor (KnownColor.DarkMagenta); } } static public Color DarkOliveGreen { - get { return KnownColors.FromKnownColor (KnownColor.DarkOliveGreen); } + get { return FromKnownColor (KnownColor.DarkOliveGreen); } } static public Color DarkOrange { - get { return KnownColors.FromKnownColor (KnownColor.DarkOrange); } + get { return FromKnownColor (KnownColor.DarkOrange); } } static public Color DarkOrchid { - get { return KnownColors.FromKnownColor (KnownColor.DarkOrchid); } + get { return FromKnownColor (KnownColor.DarkOrchid); } } static public Color DarkRed { - get { return KnownColors.FromKnownColor (KnownColor.DarkRed); } + get { return FromKnownColor (KnownColor.DarkRed); } } static public Color DarkSalmon { - get { return KnownColors.FromKnownColor (KnownColor.DarkSalmon); } + get { return FromKnownColor (KnownColor.DarkSalmon); } } static public Color DarkSeaGreen { - get { return KnownColors.FromKnownColor (KnownColor.DarkSeaGreen); } + get { return FromKnownColor (KnownColor.DarkSeaGreen); } } static public Color DarkSlateBlue { - get { return KnownColors.FromKnownColor (KnownColor.DarkSlateBlue); } + get { return FromKnownColor (KnownColor.DarkSlateBlue); } } static public Color DarkSlateGray { - get { return KnownColors.FromKnownColor (KnownColor.DarkSlateGray); } + get { return FromKnownColor (KnownColor.DarkSlateGray); } } static public Color DarkTurquoise { - get { return KnownColors.FromKnownColor (KnownColor.DarkTurquoise); } + get { return FromKnownColor (KnownColor.DarkTurquoise); } } static public Color DarkViolet { - get { return KnownColors.FromKnownColor (KnownColor.DarkViolet); } + get { return FromKnownColor (KnownColor.DarkViolet); } } static public Color DeepPink { - get { return KnownColors.FromKnownColor (KnownColor.DeepPink); } + get { return FromKnownColor (KnownColor.DeepPink); } } static public Color DeepSkyBlue { - get { return KnownColors.FromKnownColor (KnownColor.DeepSkyBlue); } + get { return FromKnownColor (KnownColor.DeepSkyBlue); } } static public Color DimGray { - get { return KnownColors.FromKnownColor (KnownColor.DimGray); } + get { return FromKnownColor (KnownColor.DimGray); } } static public Color DodgerBlue { - get { return KnownColors.FromKnownColor (KnownColor.DodgerBlue); } + get { return FromKnownColor (KnownColor.DodgerBlue); } } static public Color Firebrick { - get { return KnownColors.FromKnownColor (KnownColor.Firebrick); } + get { return FromKnownColor (KnownColor.Firebrick); } } static public Color FloralWhite { - get { return KnownColors.FromKnownColor (KnownColor.FloralWhite); } + get { return FromKnownColor (KnownColor.FloralWhite); } } static public Color ForestGreen { - get { return KnownColors.FromKnownColor (KnownColor.ForestGreen); } + get { return FromKnownColor (KnownColor.ForestGreen); } } static public Color Fuchsia { - get { return KnownColors.FromKnownColor (KnownColor.Fuchsia); } + get { return FromKnownColor (KnownColor.Fuchsia); } } static public Color Gainsboro { - get { return KnownColors.FromKnownColor (KnownColor.Gainsboro); } + get { return FromKnownColor (KnownColor.Gainsboro); } } static public Color GhostWhite { - get { return KnownColors.FromKnownColor (KnownColor.GhostWhite); } + get { return FromKnownColor (KnownColor.GhostWhite); } } static public Color Gold { - get { return KnownColors.FromKnownColor (KnownColor.Gold); } + get { return FromKnownColor (KnownColor.Gold); } } static public Color Goldenrod { - get { return KnownColors.FromKnownColor (KnownColor.Goldenrod); } + get { return FromKnownColor (KnownColor.Goldenrod); } } static public Color Gray { - get { return KnownColors.FromKnownColor (KnownColor.Gray); } + get { return FromKnownColor (KnownColor.Gray); } } static public Color Green { - get { return KnownColors.FromKnownColor (KnownColor.Green); } + get { return FromKnownColor (KnownColor.Green); } } static public Color GreenYellow { - get { return KnownColors.FromKnownColor (KnownColor.GreenYellow); } + get { return FromKnownColor (KnownColor.GreenYellow); } } static public Color Honeydew { - get { return KnownColors.FromKnownColor (KnownColor.Honeydew); } + get { return FromKnownColor (KnownColor.Honeydew); } } static public Color HotPink { - get { return KnownColors.FromKnownColor (KnownColor.HotPink); } + get { return FromKnownColor (KnownColor.HotPink); } } static public Color IndianRed { - get { return KnownColors.FromKnownColor (KnownColor.IndianRed); } + get { return FromKnownColor (KnownColor.IndianRed); } } static public Color Indigo { - get { return KnownColors.FromKnownColor (KnownColor.Indigo); } + get { return FromKnownColor (KnownColor.Indigo); } } static public Color Ivory { - get { return KnownColors.FromKnownColor (KnownColor.Ivory); } + get { return FromKnownColor (KnownColor.Ivory); } } static public Color Khaki { - get { return KnownColors.FromKnownColor (KnownColor.Khaki); } + get { return FromKnownColor (KnownColor.Khaki); } } static public Color Lavender { - get { return KnownColors.FromKnownColor (KnownColor.Lavender); } + get { return FromKnownColor (KnownColor.Lavender); } } static public Color LavenderBlush { - get { return KnownColors.FromKnownColor (KnownColor.LavenderBlush); } + get { return FromKnownColor (KnownColor.LavenderBlush); } } static public Color LawnGreen { - get { return KnownColors.FromKnownColor (KnownColor.LawnGreen); } + get { return FromKnownColor (KnownColor.LawnGreen); } } static public Color LemonChiffon { - get { return KnownColors.FromKnownColor (KnownColor.LemonChiffon); } + get { return FromKnownColor (KnownColor.LemonChiffon); } } static public Color LightBlue { - get { return KnownColors.FromKnownColor (KnownColor.LightBlue); } + get { return FromKnownColor (KnownColor.LightBlue); } } static public Color LightCoral { - get { return KnownColors.FromKnownColor (KnownColor.LightCoral); } + get { return FromKnownColor (KnownColor.LightCoral); } } static public Color LightCyan { - get { return KnownColors.FromKnownColor (KnownColor.LightCyan); } + get { return FromKnownColor (KnownColor.LightCyan); } } static public Color LightGoldenrodYellow { - get { return KnownColors.FromKnownColor (KnownColor.LightGoldenrodYellow); } + get { return FromKnownColor (KnownColor.LightGoldenrodYellow); } } static public Color LightGreen { - get { return KnownColors.FromKnownColor (KnownColor.LightGreen); } + get { return FromKnownColor (KnownColor.LightGreen); } } static public Color LightGray { - get { return KnownColors.FromKnownColor (KnownColor.LightGray); } + get { return FromKnownColor (KnownColor.LightGray); } } static public Color LightPink { - get { return KnownColors.FromKnownColor (KnownColor.LightPink); } + get { return FromKnownColor (KnownColor.LightPink); } } static public Color LightSalmon { - get { return KnownColors.FromKnownColor (KnownColor.LightSalmon); } + get { return FromKnownColor (KnownColor.LightSalmon); } } static public Color LightSeaGreen { - get { return KnownColors.FromKnownColor (KnownColor.LightSeaGreen); } + get { return FromKnownColor (KnownColor.LightSeaGreen); } } static public Color LightSkyBlue { - get { return KnownColors.FromKnownColor (KnownColor.LightSkyBlue); } + get { return FromKnownColor (KnownColor.LightSkyBlue); } } static public Color LightSlateGray { - get { return KnownColors.FromKnownColor (KnownColor.LightSlateGray); } + get { return FromKnownColor (KnownColor.LightSlateGray); } } static public Color LightSteelBlue { - get { return KnownColors.FromKnownColor (KnownColor.LightSteelBlue); } + get { return FromKnownColor (KnownColor.LightSteelBlue); } } static public Color LightYellow { - get { return KnownColors.FromKnownColor (KnownColor.LightYellow); } + get { return FromKnownColor (KnownColor.LightYellow); } } static public Color Lime { - get { return KnownColors.FromKnownColor (KnownColor.Lime); } + get { return FromKnownColor (KnownColor.Lime); } } static public Color LimeGreen { - get { return KnownColors.FromKnownColor (KnownColor.LimeGreen); } + get { return FromKnownColor (KnownColor.LimeGreen); } } static public Color Linen { - get { return KnownColors.FromKnownColor (KnownColor.Linen); } + get { return FromKnownColor (KnownColor.Linen); } } static public Color Magenta { - get { return KnownColors.FromKnownColor (KnownColor.Magenta); } + get { return FromKnownColor (KnownColor.Magenta); } } static public Color Maroon { - get { return KnownColors.FromKnownColor (KnownColor.Maroon); } + get { return FromKnownColor (KnownColor.Maroon); } } static public Color MediumAquamarine { - get { return KnownColors.FromKnownColor (KnownColor.MediumAquamarine); } + get { return FromKnownColor (KnownColor.MediumAquamarine); } } static public Color MediumBlue { - get { return KnownColors.FromKnownColor (KnownColor.MediumBlue); } + get { return FromKnownColor (KnownColor.MediumBlue); } } static public Color MediumOrchid { - get { return KnownColors.FromKnownColor (KnownColor.MediumOrchid); } + get { return FromKnownColor (KnownColor.MediumOrchid); } } static public Color MediumPurple { - get { return KnownColors.FromKnownColor (KnownColor.MediumPurple); } + get { return FromKnownColor (KnownColor.MediumPurple); } } static public Color MediumSeaGreen { - get { return KnownColors.FromKnownColor (KnownColor.MediumSeaGreen); } + get { return FromKnownColor (KnownColor.MediumSeaGreen); } } static public Color MediumSlateBlue { - get { return KnownColors.FromKnownColor (KnownColor.MediumSlateBlue); } + get { return FromKnownColor (KnownColor.MediumSlateBlue); } } static public Color MediumSpringGreen { - get { return KnownColors.FromKnownColor (KnownColor.MediumSpringGreen); } + get { return FromKnownColor (KnownColor.MediumSpringGreen); } } static public Color MediumTurquoise { - get { return KnownColors.FromKnownColor (KnownColor.MediumTurquoise); } + get { return FromKnownColor (KnownColor.MediumTurquoise); } } static public Color MediumVioletRed { - get { return KnownColors.FromKnownColor (KnownColor.MediumVioletRed); } + get { return FromKnownColor (KnownColor.MediumVioletRed); } } static public Color MidnightBlue { - get { return KnownColors.FromKnownColor (KnownColor.MidnightBlue); } + get { return FromKnownColor (KnownColor.MidnightBlue); } } static public Color MintCream { - get { return KnownColors.FromKnownColor (KnownColor.MintCream); } + get { return FromKnownColor (KnownColor.MintCream); } } static public Color MistyRose { - get { return KnownColors.FromKnownColor (KnownColor.MistyRose); } + get { return FromKnownColor (KnownColor.MistyRose); } } static public Color Moccasin { - get { return KnownColors.FromKnownColor (KnownColor.Moccasin); } + get { return FromKnownColor (KnownColor.Moccasin); } } static public Color NavajoWhite { - get { return KnownColors.FromKnownColor (KnownColor.NavajoWhite); } + get { return FromKnownColor (KnownColor.NavajoWhite); } } static public Color Navy { - get { return KnownColors.FromKnownColor (KnownColor.Navy); } + get { return FromKnownColor (KnownColor.Navy); } } static public Color OldLace { - get { return KnownColors.FromKnownColor (KnownColor.OldLace); } + get { return FromKnownColor (KnownColor.OldLace); } } static public Color Olive { - get { return KnownColors.FromKnownColor (KnownColor.Olive); } + get { return FromKnownColor (KnownColor.Olive); } } static public Color OliveDrab { - get { return KnownColors.FromKnownColor (KnownColor.OliveDrab); } + get { return FromKnownColor (KnownColor.OliveDrab); } } static public Color Orange { - get { return KnownColors.FromKnownColor (KnownColor.Orange); } + get { return FromKnownColor (KnownColor.Orange); } } static public Color OrangeRed { - get { return KnownColors.FromKnownColor (KnownColor.OrangeRed); } + get { return FromKnownColor (KnownColor.OrangeRed); } } static public Color Orchid { - get { return KnownColors.FromKnownColor (KnownColor.Orchid); } + get { return FromKnownColor (KnownColor.Orchid); } } static public Color PaleGoldenrod { - get { return KnownColors.FromKnownColor (KnownColor.PaleGoldenrod); } + get { return FromKnownColor (KnownColor.PaleGoldenrod); } } static public Color PaleGreen { - get { return KnownColors.FromKnownColor (KnownColor.PaleGreen); } + get { return FromKnownColor (KnownColor.PaleGreen); } } static public Color PaleTurquoise { - get { return KnownColors.FromKnownColor (KnownColor.PaleTurquoise); } + get { return FromKnownColor (KnownColor.PaleTurquoise); } } static public Color PaleVioletRed { - get { return KnownColors.FromKnownColor (KnownColor.PaleVioletRed); } + get { return FromKnownColor (KnownColor.PaleVioletRed); } } static public Color PapayaWhip { - get { return KnownColors.FromKnownColor (KnownColor.PapayaWhip); } + get { return FromKnownColor (KnownColor.PapayaWhip); } } static public Color PeachPuff { - get { return KnownColors.FromKnownColor (KnownColor.PeachPuff); } + get { return FromKnownColor (KnownColor.PeachPuff); } } static public Color Peru { - get { return KnownColors.FromKnownColor (KnownColor.Peru); } + get { return FromKnownColor (KnownColor.Peru); } } static public Color Pink { - get { return KnownColors.FromKnownColor (KnownColor.Pink); } + get { return FromKnownColor (KnownColor.Pink); } } static public Color Plum { - get { return KnownColors.FromKnownColor (KnownColor.Plum); } + get { return FromKnownColor (KnownColor.Plum); } } static public Color PowderBlue { - get { return KnownColors.FromKnownColor (KnownColor.PowderBlue); } + get { return FromKnownColor (KnownColor.PowderBlue); } } static public Color Purple { - get { return KnownColors.FromKnownColor (KnownColor.Purple); } + get { return FromKnownColor (KnownColor.Purple); } } static public Color Red { - get { return KnownColors.FromKnownColor (KnownColor.Red); } + get { return FromKnownColor (KnownColor.Red); } } static public Color RosyBrown { - get { return KnownColors.FromKnownColor (KnownColor.RosyBrown); } + get { return FromKnownColor (KnownColor.RosyBrown); } } static public Color RoyalBlue { - get { return KnownColors.FromKnownColor (KnownColor.RoyalBlue); } + get { return FromKnownColor (KnownColor.RoyalBlue); } } static public Color SaddleBrown { - get { return KnownColors.FromKnownColor (KnownColor.SaddleBrown); } + get { return FromKnownColor (KnownColor.SaddleBrown); } } static public Color Salmon { - get { return KnownColors.FromKnownColor (KnownColor.Salmon); } + get { return FromKnownColor (KnownColor.Salmon); } } static public Color SandyBrown { - get { return KnownColors.FromKnownColor (KnownColor.SandyBrown); } + get { return FromKnownColor (KnownColor.SandyBrown); } } static public Color SeaGreen { - get { return KnownColors.FromKnownColor (KnownColor.SeaGreen); } + get { return FromKnownColor (KnownColor.SeaGreen); } } static public Color SeaShell { - get { return KnownColors.FromKnownColor (KnownColor.SeaShell); } + get { return FromKnownColor (KnownColor.SeaShell); } } static public Color Sienna { - get { return KnownColors.FromKnownColor (KnownColor.Sienna); } + get { return FromKnownColor (KnownColor.Sienna); } } static public Color Silver { - get { return KnownColors.FromKnownColor (KnownColor.Silver); } + get { return FromKnownColor (KnownColor.Silver); } } static public Color SkyBlue { - get { return KnownColors.FromKnownColor (KnownColor.SkyBlue); } + get { return FromKnownColor (KnownColor.SkyBlue); } } static public Color SlateBlue { - get { return KnownColors.FromKnownColor (KnownColor.SlateBlue); } + get { return FromKnownColor (KnownColor.SlateBlue); } } static public Color SlateGray { - get { return KnownColors.FromKnownColor (KnownColor.SlateGray); } + get { return FromKnownColor (KnownColor.SlateGray); } } static public Color Snow { - get { return KnownColors.FromKnownColor (KnownColor.Snow); } + get { return FromKnownColor (KnownColor.Snow); } } static public Color SpringGreen { - get { return KnownColors.FromKnownColor (KnownColor.SpringGreen); } + get { return FromKnownColor (KnownColor.SpringGreen); } } static public Color SteelBlue { - get { return KnownColors.FromKnownColor (KnownColor.SteelBlue); } + get { return FromKnownColor (KnownColor.SteelBlue); } } static public Color Tan { - get { return KnownColors.FromKnownColor (KnownColor.Tan); } + get { return FromKnownColor (KnownColor.Tan); } } static public Color Teal { - get { return KnownColors.FromKnownColor (KnownColor.Teal); } + get { return FromKnownColor (KnownColor.Teal); } } static public Color Thistle { - get { return KnownColors.FromKnownColor (KnownColor.Thistle); } + get { return FromKnownColor (KnownColor.Thistle); } } static public Color Tomato { - get { return KnownColors.FromKnownColor (KnownColor.Tomato); } + get { return FromKnownColor (KnownColor.Tomato); } } static public Color Turquoise { - get { return KnownColors.FromKnownColor (KnownColor.Turquoise); } + get { return FromKnownColor (KnownColor.Turquoise); } } static public Color Violet { - get { return KnownColors.FromKnownColor (KnownColor.Violet); } + get { return FromKnownColor (KnownColor.Violet); } } static public Color Wheat { - get { return KnownColors.FromKnownColor (KnownColor.Wheat); } + get { return FromKnownColor (KnownColor.Wheat); } } static public Color White { - get { return KnownColors.FromKnownColor (KnownColor.White); } + get { return FromKnownColor (KnownColor.White); } } static public Color WhiteSmoke { - get { return KnownColors.FromKnownColor (KnownColor.WhiteSmoke); } + get { return FromKnownColor (KnownColor.WhiteSmoke); } } static public Color Yellow { - get { return KnownColors.FromKnownColor (KnownColor.Yellow); } + get { return FromKnownColor (KnownColor.Yellow); } } static public Color YellowGreen { - get { return KnownColors.FromKnownColor (KnownColor.YellowGreen); } + get { return FromKnownColor (KnownColor.YellowGreen); } } } } diff --git a/mcs/class/System.Drawing/System.Drawing/Font.cs b/mcs/class/System.Drawing/System.Drawing/Font.cs index d542b642c4..31861d5123 100644 --- a/mcs/class/System.Drawing/System.Drawing/Font.cs +++ b/mcs/class/System.Drawing/System.Drawing/Font.cs @@ -31,9 +31,9 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Reflection; using System.Runtime.Serialization; using System.Runtime.InteropServices; -using System.Security.Permissions; using System.ComponentModel; namespace System.Drawing @@ -428,10 +428,7 @@ namespace System.Drawing [Browsable(false)] public bool IsSystemFont { get { - if (systemFontName == null) - return false; - - return StringComparer.InvariantCulture.Compare (systemFontName, string.Empty) != 0; + return !string.IsNullOrEmpty (systemFontName); } } @@ -591,7 +588,6 @@ namespace System.Drawing } } - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void ToLogFont (object logFont) { if (GDIPlus.RunningOnUnix ()) { @@ -616,7 +612,6 @@ namespace System.Drawing } } - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void ToLogFont (object logFont, Graphics graphics) { if (graphics == null) @@ -627,7 +622,7 @@ namespace System.Drawing } Type st = logFont.GetType (); - if (!st.IsLayoutSequential) + if (!st.GetTypeInfo ().IsLayoutSequential) throw new ArgumentException ("logFont", Locale.GetText ("Layout must be sequential.")); // note: there is no exception if 'logFont' isn't big enough diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.cs index 64d13ab059..9c002db416 100644 --- a/mcs/class/System.Drawing/System.Drawing/Graphics.cs +++ b/mcs/class/System.Drawing/System.Drawing/Graphics.cs @@ -35,7 +35,6 @@ using System.Drawing.Imaging; using System.Drawing.Text; using System.ComponentModel; using System.Runtime.InteropServices; -using System.Security.Permissions; using System.Text; namespace System.Drawing @@ -56,7 +55,7 @@ namespace System.Drawing IntPtr data, PlayRecordCallback callbackData); - public delegate bool DrawImageAbort (IntPtr callbackData); + public delegate bool DrawImageAbort (IntPtr callbackdata); internal Graphics (IntPtr nativeGraphics) { @@ -1692,7 +1691,6 @@ namespace System.Drawing } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public static Graphics FromHdcInternal (IntPtr hdc) { GDIPlus.Display = hdc; @@ -1744,7 +1742,6 @@ namespace System.Drawing } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public static Graphics FromHwndInternal (IntPtr hwnd) { return FromHwnd (hwnd); @@ -2015,13 +2012,11 @@ namespace System.Drawing } [EditorBrowsable (EditorBrowsableState.Advanced)] - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void ReleaseHdc (IntPtr hdc) { ReleaseHdcInternal (hdc); } - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public void ReleaseHdc () { ReleaseHdcInternal (deviceContextHdc); @@ -2029,7 +2024,6 @@ namespace System.Drawing [MonoLimitation ("Can only be used when hdc was provided by Graphics.GetHdc() method")] [EditorBrowsable (EditorBrowsableState.Never)] - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public void ReleaseHdcInternal (IntPtr hdc) { Status status = Status.InvalidParameter; diff --git a/mcs/class/System.Drawing/System.Drawing/Icon.cs b/mcs/class/System.Drawing/System.Drawing/Icon.cs index f2da71b314..6fe88d5a2e 100644 --- a/mcs/class/System.Drawing/System.Drawing/Icon.cs +++ b/mcs/class/System.Drawing/System.Drawing/Icon.cs @@ -36,9 +36,9 @@ using System.Collections; using System.ComponentModel; using System.Drawing.Imaging; using System.IO; +using System.Reflection; using System.Runtime.Serialization; using System.Runtime.InteropServices; -using System.Security.Permissions; namespace System.Drawing { @@ -230,7 +230,11 @@ namespace System.Drawing if (resource == null) throw new ArgumentException ("resource"); - using (Stream s = type.Assembly.GetManifestResourceStream (type, resource)) { + // For compatibility with the .NET Framework + if (type == null) + throw new NullReferenceException(); + + using (Stream s = type.GetTypeInfo ().Assembly.GetManifestResourceStream (type, resource)) { if (s == null) { string msg = Locale.GetText ("Resource '{0}' was not found.", resource); throw new FileNotFoundException (msg); @@ -262,7 +266,7 @@ namespace System.Drawing internal Icon (string resourceName, bool undisposable) { - using (Stream s = typeof (Icon).Assembly.GetManifestResourceStream (resourceName)) { + using (Stream s = typeof (Icon).GetTypeInfo ().Assembly.GetManifestResourceStream (resourceName)) { if (s == null) { string msg = Locale.GetText ("Resource '{0}' was not found.", resourceName); throw new FileNotFoundException (msg); @@ -338,7 +342,6 @@ namespace System.Drawing } #if !MONOTOUCH - [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)] public static Icon FromHandle (IntPtr handle) { if (handle == IntPtr.Zero) @@ -861,10 +864,10 @@ Console.WriteLine ("\tbih.biClrImportant: {0}", bih.biClrImportant); } imageData [j] = iidata; - bihReader.Close(); + bihReader.Dispose (); } - reader.Close(); + reader.Dispose (); } } } diff --git a/mcs/class/System.Drawing/System.Drawing/Image.cs b/mcs/class/System.Drawing/System.Drawing/Image.cs index 969d9ac785..6bd89918dd 100644 --- a/mcs/class/System.Drawing/System.Drawing/Image.cs +++ b/mcs/class/System.Drawing/System.Drawing/Image.cs @@ -32,7 +32,6 @@ // using System; -using System.Runtime.Remoting; using System.Runtime.Serialization; using System.Runtime.InteropServices; using System.ComponentModel; @@ -795,7 +794,7 @@ public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISer Status status = GDIPlus.GdipDisposeImage (nativeObject); // dispose the stream (set under Win32 only if SD owns the stream) and ... if (stream != null) { - stream.Close (); + stream.Dispose (); stream = null; } // ... set nativeObject to null before (possibly) throwing an exception diff --git a/mcs/class/System.Drawing/System.Drawing/KnownColors.cs b/mcs/class/System.Drawing/System.Drawing/KnownColors.cs index 77b1b16251..fa3c787811 100644 --- a/mcs/class/System.Drawing/System.Drawing/KnownColors.cs +++ b/mcs/class/System.Drawing/System.Drawing/KnownColors.cs @@ -269,21 +269,7 @@ namespace System.Drawing { public static Color FromKnownColor (KnownColor kc) { - Color c; - short n = (short)kc; - if ((n <= 0) || (n >= ArgbValues.Length)) { - // This is what it returns! - c = Color.FromArgb (0, 0, 0, 0); - c.state |= (short) Color.ColorType.Named; - } else { - c = new Color (); - c.state = (short) (Color.ColorType.ARGB | Color.ColorType.Known | Color.ColorType.Named); - if ((n < 27) || (n > 169)) - c.state |= (short) Color.ColorType.System; - c.Value = ArgbValues [n]; - } - c.knownColor = n; - return c; + return Color.FromKnownColor (kc); } public static string GetName (short kc) diff --git a/mcs/class/System.Drawing/System.Drawing/Region.cs b/mcs/class/System.Drawing/System.Drawing/Region.cs index 3b1f0b3d91..0e3a550886 100644 --- a/mcs/class/System.Drawing/System.Drawing/Region.cs +++ b/mcs/class/System.Drawing/System.Drawing/Region.cs @@ -30,7 +30,6 @@ using System.Drawing.Drawing2D; using System.Runtime.InteropServices; -using System.Security.Permissions; namespace System.Drawing { @@ -510,7 +509,6 @@ namespace System.Drawing return result; } - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public static Region FromHrgn (IntPtr hrgn) { if (hrgn == IntPtr.Zero) @@ -639,7 +637,6 @@ namespace System.Drawing } } // why is this a instance method ? and not static ? - [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)] public void ReleaseHrgn (IntPtr regionHandle) { if (regionHandle == IntPtr.Zero) diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs new file mode 100644 index 0000000000..cdcdd99d2e --- /dev/null +++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs @@ -0,0 +1,1980 @@ +// +// System.Drawing.gdipFunctions.cs +// +// Authors: +// Alexandre Pigolkine (pigolkine@gmx.de) +// Jordi Mas i Hernandez (jordi@ximian.com) +// Sanjay Gupta (gsanjay@novell.com) +// Ravindra (rkumar@novell.com) +// Peter Dennis Bartok (pbartok@novell.com) +// Sebastien Pouliot +// +// Copyright (C) 2004 - 2007 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System.IO; +using System.Runtime.InteropServices; +using System.Text; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; +using System.Drawing.Text; +using System.Globalization; +using System.Security; +using System.Runtime.InteropServices.ComTypes; + +namespace System.Drawing +{ + /// + /// GDI+ API Functions + /// + internal static class GDIPlus { + public const int FACESIZE = 32; + public const int LANG_NEUTRAL = 0; + public static IntPtr Display = IntPtr.Zero; + public static bool UseX11Drawable = false; + public static bool UseCarbonDrawable = false; + public static bool UseCocoaDrawable = false; + + private const string GdiPlus = "gdiplus"; + + #region gdiplus.dll functions + + // startup / shutdown + [DllImport(GdiPlus)] + static internal extern Status GdiplusStartup(ref ulong token, ref GdiplusStartupInput input, ref GdiplusStartupOutput output); + [DllImport(GdiPlus)] + static internal extern void GdiplusShutdown(ref ulong token); + + internal static ulong GdiPlusToken = 0; + + static void ProcessExit (object sender, EventArgs e) + { + // Called all pending objects and claim any pending handle before + // shutting down + GC.Collect (); + GC.WaitForPendingFinalizers (); +#if false + GdiPlusToken = 0; + + // This causes crashes in because this call occurs before all + // managed GDI+ objects are finalized. When they are finalized + // they call into a shutdown GDI+ and we crash. + GdiplusShutdown (ref GdiPlusToken); + + // This causes crashes in Mono libgdiplus because this call + // occurs before all managed GDI objects are finalized + // When they are finalized they use the closed display and + // crash + if (UseX11Drawable && Display != IntPtr.Zero) { + XCloseDisplay (Display); + } +#endif + } + + static GDIPlus () + { + int platform = (int) Environment.OSVersion.Platform; + if ((platform == 4) || (platform == 6) || (platform == 128)) { + if (Environment.GetEnvironmentVariable ("not_supported_MONO_MWF_USE_NEW_X11_BACKEND") != null || Environment.GetEnvironmentVariable ("MONO_MWF_MAC_FORCE_X11") != null) { + UseX11Drawable = true; + } else { + IntPtr buf = Marshal.AllocHGlobal (8192); + // This is kind of a hack but gets us sysname from uname (struct utsname *name) on + // linux and darwin + if (uname (buf) != 0) { + // WTH: We couldn't detect the OS; lets default to X11 + UseX11Drawable = true; + } else { + string os = Marshal.PtrToStringAnsi (buf); + if (os == "Darwin") + UseCarbonDrawable = true; + else + UseX11Drawable = true; + } + Marshal.FreeHGlobal (buf); + } + } + + GdiplusStartupInput input = GdiplusStartupInput.MakeGdiplusStartupInput(); + GdiplusStartupOutput output = GdiplusStartupOutput.MakeGdiplusStartupOutput(); + try { + GdiplusStartup (ref GdiPlusToken, ref input, ref output); + } + catch (TypeInitializationException) { + Console.Error.WriteLine ( + "* ERROR: Can not initialize GDI+ library{0}{0}" + + "Please check http://www.mono-project.com/Problem:GDIPlusInit for details", + Environment.NewLine); + } + + // under MS 1.x this event is raised only for the default application domain + AppDomain.CurrentDomain.ProcessExit += new EventHandler (ProcessExit); + } + + static public bool RunningOnWindows () + { + return !UseX11Drawable && !UseCarbonDrawable && !UseCocoaDrawable; + } + + static public bool RunningOnUnix () + { + return UseX11Drawable || UseCarbonDrawable || UseCocoaDrawable; + } + + // Copies a Ptr to an array of Points and releases the memory + static public void FromUnManagedMemoryToPointI (IntPtr prt, Point [] pts) + { + int nPointSize = Marshal.SizeOf (pts[0]); + IntPtr pos = prt; + for (int i=0; i 0 && buf != IntPtr.Zero) { + Marshal.Copy (start_buf, 0, (IntPtr) (buf.ToInt64()), bytesRead); + } + + start_buf_pos = 0; + start_buf_len = bytesRead; + + return bytesRead; + } + + public StreamGetHeaderDelegate GetHeaderDelegate { + get { + if (stream != null && stream.CanRead) { + if (sghd == null) { + sghd = new StreamGetHeaderDelegate (StreamGetHeaderImpl); + } + return sghd; + } + return null; + } + } + + public int StreamGetBytesImpl (IntPtr buf, int bufsz, bool peek) + { + if (buf == IntPtr.Zero && peek) { + return -1; + } + + if (bufsz > managedBuf.Length) + managedBuf = new byte[bufsz]; + int bytesRead = 0; + long streamPosition = 0; + + if (bufsz > 0) { + if (stream.CanSeek) { + streamPosition = stream.Position; + } + if (start_buf_len > 0) { + if (start_buf_len > bufsz) { + Array.Copy(start_buf, start_buf_pos, managedBuf, 0, bufsz); + start_buf_pos += bufsz; + start_buf_len -= bufsz; + bytesRead = bufsz; + bufsz = 0; + } else { + // this is easy + Array.Copy(start_buf, start_buf_pos, managedBuf, 0, start_buf_len); + bufsz -= start_buf_len; + bytesRead = start_buf_len; + start_buf_len = 0; + } + } + + if (bufsz > 0) { + try { + bytesRead += stream.Read (managedBuf, bytesRead, bufsz); + } catch (IOException) { + return -1; + } + } + + if (bytesRead > 0 && buf != IntPtr.Zero) { + Marshal.Copy (managedBuf, 0, (IntPtr) (buf.ToInt64()), bytesRead); + } + + if (!stream.CanSeek && (bufsz == 10) && peek) { + // Special 'hack' to support peeking of the type for gdi+ on non-seekable streams + } + + if (peek) { + if (stream.CanSeek) { + // If we are peeking bytes, then go back to original position before peeking + stream.Seek (streamPosition, SeekOrigin.Begin); + } else { + throw new NotSupportedException(); + } + } + } + + return bytesRead; + } + + public StreamGetBytesDelegate GetBytesDelegate { + get { + if (stream != null && stream.CanRead) { + if (sgbd == null) { + sgbd = new StreamGetBytesDelegate (StreamGetBytesImpl); + } + return sgbd; + } + return null; + } + } + + public long StreamSeekImpl (int offset, int whence) + { + // Make sure we have a valid 'whence'. + if ((whence < 0) || (whence > 2)) + return -1; + + // Invalidate the start_buf if we're actually going to call a Seek method. + start_buf_pos += start_buf_len; + start_buf_len = 0; + + SeekOrigin origin; + + // Translate 'whence' into a SeekOrigin enum member. + switch (whence) + { + case 0: origin = SeekOrigin.Begin; break; + case 1: origin = SeekOrigin.Current; break; + case 2: origin = SeekOrigin.End; break; + + // The following line is redundant but necessary to avoid a + // "Use of unassigned local variable" error without actually + // initializing 'origin' to a dummy value. + default: return -1; + } + + // Do the actual seek operation and return its result. + return stream.Seek ((long) offset, origin); + } + + public StreamSeekDelegate SeekDelegate { + get { + if (stream != null && stream.CanSeek) { + if (skd == null) { + skd = new StreamSeekDelegate (StreamSeekImpl); + } + return skd; + } + return null; + } + } + + public int StreamPutBytesImpl (IntPtr buf, int bufsz) + { + if (bufsz > managedBuf.Length) + managedBuf = new byte[bufsz]; + Marshal.Copy (buf, managedBuf, 0, bufsz); + stream.Write (managedBuf, 0, bufsz); + return bufsz; + } + + public StreamPutBytesDelegate PutBytesDelegate { + get { + if (stream != null && stream.CanWrite) { + if (spbd == null) { + spbd = new StreamPutBytesDelegate (StreamPutBytesImpl); + } + return spbd; + } + return null; + } + } + + public void StreamCloseImpl () + { + stream.Close (); + } + + public StreamCloseDelegate CloseDelegate { + get { + if (stream != null) { + if (scd == null) { + scd = new StreamCloseDelegate (StreamCloseImpl); + } + return scd; + } + return null; + } + } + + public long StreamSizeImpl () + { + try { + return stream.Length; + } catch { + return -1; + } + } + + public StreamSizeDelegate SizeDelegate { + get { + if (stream != null) { + if (ssd == null) { + ssd = new StreamSizeDelegate (StreamSizeImpl); + } + return ssd; + } + return null; + } + } + + } + + /* Mac only function calls */ + [DllImport(GdiPlus)] + internal static extern Status GdipCreateFromContext_macosx (IntPtr cgref, int width, int height, out IntPtr graphics); + + /* Linux only function calls*/ + [DllImport(GdiPlus)] + internal static extern Status GdipSetVisibleClip_linux (IntPtr graphics, ref Rectangle rect); + + [DllImport(GdiPlus)] + internal static extern Status GdipCreateFromXDrawable_linux (IntPtr drawable, IntPtr display, out IntPtr graphics); + + // Stream functions for non-Win32 (libgdiplus specific) + [DllImport(GdiPlus)] + static internal extern Status GdipLoadImageFromDelegate_linux (StreamGetHeaderDelegate getHeader, + StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, + StreamCloseDelegate close, StreamSizeDelegate size, out IntPtr image); + + [DllImport(GdiPlus)] + static internal extern Status GdipSaveImageToDelegate_linux (IntPtr image, StreamGetBytesDelegate getBytes, + StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, StreamCloseDelegate close, + StreamSizeDelegate size, ref Guid encoderClsID, IntPtr encoderParameters); + + [DllImport(GdiPlus)] + static internal extern Status GdipCreateMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader, + StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, + StreamCloseDelegate close, StreamSizeDelegate size, out IntPtr metafile); + + [DllImport(GdiPlus)] + static internal extern Status GdipGetMetafileHeaderFromDelegate_linux (StreamGetHeaderDelegate getHeader, + StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, + StreamCloseDelegate close, StreamSizeDelegate size, IntPtr header); + + [DllImport(GdiPlus)] + static internal extern Status GdipRecordMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader, + StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, + StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref RectangleF frameRect, + MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile); + + [DllImport(GdiPlus)] + static internal extern Status GdipRecordMetafileFromDelegateI_linux (StreamGetHeaderDelegate getHeader, + StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, + StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref Rectangle frameRect, + MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile); + + [DllImport ("libc")] + static extern int uname (IntPtr buf); +#endregion + } +} diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs.REMOVED.git-id b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs.REMOVED.git-id deleted file mode 100644 index 1b724f7fcf..0000000000 --- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -5147116609f3fe81556720b34429d83ad6c459e1 \ No newline at end of file diff --git a/mcs/class/System.Drawing/System.Drawing/macFunctions.cs b/mcs/class/System.Drawing/System.Drawing/macFunctions.cs index 98d666b707..7fe2e704a8 100644 --- a/mcs/class/System.Drawing/System.Drawing/macFunctions.cs +++ b/mcs/class/System.Drawing/System.Drawing/macFunctions.cs @@ -34,7 +34,6 @@ using System.Security; namespace System.Drawing { - [SuppressUnmanagedCodeSecurity] internal static class MacSupport { internal static Hashtable contextReference = new Hashtable (); internal static object lockobj = new object (); diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/GraphicsPathTest.cs.REMOVED.git-id b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/GraphicsPathTest.cs.REMOVED.git-id index be311a83c3..77a8efcd70 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/GraphicsPathTest.cs.REMOVED.git-id +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/GraphicsPathTest.cs.REMOVED.git-id @@ -1 +1 @@ -1d44f318763de5d215b9aaed666c3b779e3f5df9 \ No newline at end of file +9674c311abbd4f19156908c4fa3b2d4bc7427100 \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/LinearGradientBrushTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/LinearGradientBrushTest.cs index bb97b81288..937c9ebbc7 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/LinearGradientBrushTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/LinearGradientBrushTest.cs @@ -325,33 +325,29 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void InterpolationColors_Colors_InvalidBlend () { // default Blend doesn't allow getting this property - Assert.IsNotNull (default_brush.InterpolationColors.Colors); + Assert.Throws (() => { var x = default_brush.InterpolationColors.Colors; }); } [Test] - [ExpectedException (typeof (ArgumentException))] public void InterpolationColors_Positions_InvalidBlend () { // default Blend doesn't allow getting this property - Assert.IsNotNull (default_brush.InterpolationColors.Positions); + Assert.Throws (() => { var x = default_brush.InterpolationColors.Positions; }); } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void LinearColors_Empty () { - default_brush.LinearColors = new Color[0]; + Assert.Throws (() => default_brush.LinearColors = new Color[0]); } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void LinearColors_One () { - default_brush.LinearColors = new Color[1]; + Assert.Throws (() => default_brush.LinearColors = new Color[1]); } [Test] @@ -400,10 +396,9 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Transform_Null () { - default_brush.Transform = null; + Assert.Throws (() => default_brush.Transform = null); } [Test] @@ -415,10 +410,9 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Transform_NonInvertible () { - default_brush.Transform = new Matrix (123, 24, 82, 16, 47, 30); + Assert.Throws (() => default_brush.Transform = new Matrix (123, 24, 82, 16, 47, 30)); } [Test] @@ -436,17 +430,15 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void WrapMode_Clamp () { - default_brush.WrapMode = WrapMode.Clamp; + Assert.Throws (() => default_brush.WrapMode = WrapMode.Clamp); } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void WrapMode_Invalid () { - default_brush.WrapMode = (WrapMode) Int32.MinValue; + Assert.Throws (() => default_brush.WrapMode = (WrapMode) Int32.MinValue); } @@ -466,17 +458,15 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform1_Null () { - default_brush.MultiplyTransform (null); + Assert.Throws (() => default_brush.MultiplyTransform (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform2_Null () { - default_brush.MultiplyTransform (null, MatrixOrder.Append); + Assert.Throws (() => default_brush.MultiplyTransform (null, MatrixOrder.Append)); } [Test] @@ -486,11 +476,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void MultiplyTransform_NonInvertible () { Matrix noninvertible = new Matrix (123, 24, 82, 16, 47, 30); - default_brush.MultiplyTransform (noninvertible); + Assert.Throws (() => default_brush.MultiplyTransform (noninvertible)); } [Test] @@ -550,11 +539,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void RotateTransform_InvalidOrder () { LinearGradientBrush lgb = new LinearGradientBrush (pt1, pt2, c1, c2); - lgb.RotateTransform (720, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => lgb.RotateTransform (720, (MatrixOrder) Int32.MinValue)); } [Test] @@ -603,11 +591,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ScaleTransform_InvalidOrder () { LinearGradientBrush lgb = new LinearGradientBrush (pt1, pt2, c1, c2); - lgb.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => lgb.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -643,31 +630,27 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_FocusTooSmall () { - default_brush.SetBlendTriangularShape (-1); + Assert.Throws (() => default_brush.SetBlendTriangularShape (-1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_FocusTooBig () { - default_brush.SetBlendTriangularShape (1.01f); + Assert.Throws (() => default_brush.SetBlendTriangularShape (1.01f)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_ScaleTooSmall () { - default_brush.SetBlendTriangularShape (1, -1); + Assert.Throws (() => default_brush.SetBlendTriangularShape (1, -1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_ScaleTooBig () { - default_brush.SetBlendTriangularShape (1, 1.01f); + Assert.Throws (() => default_brush.SetBlendTriangularShape (1, 1.01f)); } [Test] @@ -703,31 +686,27 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_FocusTooSmall () { - default_brush.SetSigmaBellShape (-1); + Assert.Throws (() => default_brush.SetSigmaBellShape (-1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_FocusTooBig () { - default_brush.SetSigmaBellShape (1.01f); + Assert.Throws (() => default_brush.SetSigmaBellShape (1.01f)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_ScaleTooSmall () { - default_brush.SetSigmaBellShape (1, -1); + Assert.Throws (() => default_brush.SetSigmaBellShape (1, -1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_ScaleTooBig () { - default_brush.SetSigmaBellShape (1, 1.01f); + Assert.Throws (() => default_brush.SetSigmaBellShape (1, 1.01f)); } [Test] @@ -755,11 +734,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void TranslateTransform_InvalidOrder () { LinearGradientBrush lgb = new LinearGradientBrush (pt1, pt2, c1, c2); - lgb.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => lgb.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -875,42 +853,37 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void LinearColors_Null () { - default_brush.LinearColors = null; + Assert.Throws (() => default_brush.LinearColors = null); } [Test] - [ExpectedException (typeof (ArgumentException))] public void InterpolationColors_Null () { - default_brush.InterpolationColors = null; + Assert.Throws (() => default_brush.InterpolationColors = null); } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Blend_Null () { - default_brush.Blend = null; + Assert.Throws (() => default_brush.Blend = null); } [Test] - [ExpectedException (typeof (ArgumentException))] public void ZeroWidthRectangle () { Rectangle r = new Rectangle (10, 10, 0, 10); Assert.AreEqual (0, r.Width, "Width"); - new LinearGradientBrush (r, Color.Red, Color.Blue, LinearGradientMode.Vertical); + Assert.Throws (() => new LinearGradientBrush (r, Color.Red, Color.Blue, LinearGradientMode.Vertical)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void ZeroHeightRectangleF () { RectangleF r = new RectangleF (10.0f, 10.0f, 10.0f, 0.0f); Assert.AreEqual (0.0f, r.Height, "Height"); - new LinearGradientBrush (r, Color.Red, Color.Blue, LinearGradientMode.Vertical); + Assert.Throws (() => new LinearGradientBrush (r, Color.Red, Color.Blue, LinearGradientMode.Vertical)); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/PathGradientBrushTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/PathGradientBrushTest.cs index bc7cd5d368..36eb082c42 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/PathGradientBrushTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/PathGradientBrushTest.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Drawing2D { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PathGradientBrushTest { private Point[] pts_2i; @@ -91,30 +90,27 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_GraphicsPath_Null () { GraphicsPath gp = null; - new PathGradientBrush (gp); + Assert.Throws (() => new PathGradientBrush (gp)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_GraphicsPath_Empty () { using (GraphicsPath gp = new GraphicsPath ()) { - new PathGradientBrush (gp); + Assert.Throws (() => new PathGradientBrush (gp)); } } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_GraphicsPath_SinglePoint () { using (GraphicsPath gp = new GraphicsPath ()) { gp.AddLines (new Point[1] { new Point (1, 1) }); // Special case - a line with a single point is valid - new PathGradientBrush (gp); + Assert.Throws (() => new PathGradientBrush (gp)); } } @@ -131,27 +127,24 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_Point_Null () { Point[] pts = null; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_Point_Empty () { Point[] pts = new Point [0]; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_Point_One () { Point[] pts = new Point[1] { new Point (1, 1) }; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] @@ -209,27 +202,24 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_PointF_Null () { PointF[] pts = null; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_PointF_Empty () { PointF[] pts = new PointF[0]; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void Constructor_PointF_One () { PointF[] pts = new PointF[1] { new PointF (1, 1) }; - new PathGradientBrush (pts); + Assert.Throws (() => new PathGradientBrush (pts)); } [Test] @@ -242,10 +232,9 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void Constructor_PointF_WrapMode_Invalid () { - PathGradientBrush pgb = new PathGradientBrush (pts_2f, (WrapMode)Int32.MinValue); + Assert.Throws (() => new PathGradientBrush (pts_2f, (WrapMode)Int32.MinValue)); } [Test] @@ -398,11 +387,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SurroundColors_Empty () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.TileFlipXY)) { - pgb.SurroundColors = new Color[0]; + Assert.Throws (() => pgb.SurroundColors = new Color[0]); } } @@ -448,10 +436,9 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Transform_Null () { - new PathGradientBrush (pts_2f, WrapMode.Clamp).Transform = null; + Assert.Throws (() => new PathGradientBrush (pts_2f, WrapMode.Clamp).Transform = null); } [Test] @@ -464,11 +451,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Transform_NonInvertible () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.Transform = new Matrix (123, 24, 82, 16, 47, 30); + Assert.Throws (() => pgb.Transform = new Matrix (123, 24, 82, 16, 47, 30)); } } @@ -484,11 +470,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void WrapMode_Invalid () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.WrapMode = (WrapMode) Int32.MinValue; + Assert.Throws (() => pgb.WrapMode = (WrapMode) Int32.MinValue); } } @@ -507,20 +492,18 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform1_Null () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.MultiplyTransform (null); + Assert.Throws (() => pgb.MultiplyTransform (null)); } } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform2_Null () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.MultiplyTransform (null, MatrixOrder.Append); + Assert.Throws (() => pgb.MultiplyTransform (null, MatrixOrder.Append)); } } @@ -533,12 +516,11 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void MultiplyTransform_NonInvertible () { using (Matrix noninvertible = new Matrix (123, 24, 82, 16, 47, 30)) { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.MultiplyTransform (noninvertible); + Assert.Throws (() => pgb.MultiplyTransform (noninvertible)); } } } @@ -607,11 +589,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void RotateTransform_InvalidOrder () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.RotateTransform (720, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => pgb.RotateTransform (720, (MatrixOrder) Int32.MinValue)); } } @@ -649,11 +630,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ScaleTransform_InvalidOrder () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => pgb.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue)); } } @@ -692,38 +672,34 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_FocusTooSmall () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetBlendTriangularShape (-1); + Assert.Throws (() => pgb.SetBlendTriangularShape (-1)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_FocusTooBig () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetBlendTriangularShape (1.01f); + Assert.Throws (() => pgb.SetBlendTriangularShape (1.01f)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_ScaleTooSmall () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetBlendTriangularShape (1, -1); + Assert.Throws (() => pgb.SetBlendTriangularShape (1, -1)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetBlendTriangularShape_ScaleTooBig () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetBlendTriangularShape (1, 1.01f); + Assert.Throws (() => pgb.SetBlendTriangularShape (1, 1.01f)); } } @@ -762,38 +738,34 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_FocusTooSmall () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetSigmaBellShape (-1); + Assert.Throws (() => pgb.SetSigmaBellShape (-1)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_FocusTooBig () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetSigmaBellShape (1.01f); + Assert.Throws (() => pgb.SetSigmaBellShape (1.01f)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_ScaleTooSmall () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetSigmaBellShape (1, -1); + Assert.Throws (() => pgb.SetSigmaBellShape (1, -1)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetSigmaBellShape_ScaleTooBig () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.SetSigmaBellShape (1, 1.01f); + Assert.Throws (() => pgb.SetSigmaBellShape (1, 1.01f)); } } @@ -823,11 +795,10 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (ArgumentException))] public void TranslateTransform_InvalidOrder () { using (PathGradientBrush pgb = new PathGradientBrush (pts_2f, WrapMode.Clamp)) { - pgb.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => pgb.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue)); } } @@ -877,37 +848,34 @@ namespace MonoTests.System.Drawing.Drawing2D { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Blend_Null () { using (GraphicsPath gp = new GraphicsPath ()) { gp.AddLines (pts_2f); using (PathGradientBrush pgb = new PathGradientBrush (gp)) { - pgb.Blend = null; + Assert.Throws (() => pgb.Blend = null); } } } [Test] - [ExpectedException (typeof (NullReferenceException))] public void InterpolationColors_Null () { using (GraphicsPath gp = new GraphicsPath ()) { gp.AddLines (pts_2f); using (PathGradientBrush pgb = new PathGradientBrush (gp)) { - pgb.InterpolationColors = null; + Assert.Throws (() => pgb.InterpolationColors = null); } } } [Test] - [ExpectedException (typeof (NullReferenceException))] public void SurroundColors_Null () { using (GraphicsPath gp = new GraphicsPath ()) { gp.AddLines (pts_2f); using (PathGradientBrush pgb = new PathGradientBrush (gp)) { - pgb.SurroundColors = null; + Assert.Throws (() => pgb.SurroundColors = null); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs index ffe43baaf8..79c3bdc550 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs @@ -96,10 +96,9 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (OverflowException))] public void ColorBlend_Negative () { - ColorBlend cb = new ColorBlend (-1); + Assert.Throws (() => new ColorBlend (-1)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs index 5bbb621669..b0749fa573 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Drawing2D { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class HatchBrushTest { Graphics gr; Bitmap bmp; diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestMatrix.cs b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestMatrix.cs index 4907c5b21e..438f86fb27 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestMatrix.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestMatrix.cs @@ -39,16 +39,6 @@ namespace MonoTests.System.Drawing.Drawing2D [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class MatrixTest { - private Matrix default_matrix; - private Rectangle rect; - private RectangleF rectf; - - [TestFixtureSetUp] - public void FixtureSetUp () - { - default_matrix = new Matrix (); - } - [Test] public void Constructor_Default () { @@ -83,24 +73,21 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_Int_Null () { - new Matrix (rect, null); + Assert.Throws (() => new Matrix (default (Rectangle), null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_Int_Empty () { - new Matrix (rect, new Point[0]); + Assert.Throws (() => new Matrix (default (Rectangle), new Point[0])); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_Int_4Point () { - new Matrix (rect, new Point[4]); + Assert.Throws (() => new Matrix (default (Rectangle), new Point[4])); } [Test] @@ -118,24 +105,21 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_Float_Null () { - new Matrix (rectf, null); + Assert.Throws (() => new Matrix (default (RectangleF), null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_Float_Empty () { - new Matrix (rectf, new PointF[0]); + Assert.Throws (() => new Matrix (default (RectangleF), new PointF[0])); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_Float_2PointF () { - new Matrix (rectf, new PointF[2]); + Assert.Throws (() => new Matrix (default (RectangleF), new PointF[2])); } [Test] @@ -332,10 +316,9 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void Rotate_InvalidOrder () { - new Matrix ().Rotate (180, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => new Matrix ().Rotate (180, (MatrixOrder) Int32.MinValue)); } [Test] @@ -353,17 +336,15 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void RotateAt_InvalidOrder () { - new Matrix ().RotateAt (180, new PointF (10, 10), (MatrixOrder) Int32.MinValue); + Assert.Throws (() => new Matrix ().RotateAt (180, new PointF (10, 10), (MatrixOrder) Int32.MinValue)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Multiply_Null () { - new Matrix (10, 20, 30, 40, 50, 60).Multiply (null); + Assert.Throws (() => new Matrix (10, 20, 30, 40, 50, 60).Multiply (null)); } [Test] @@ -381,10 +362,9 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Multiply_Null_Order () { - new Matrix (10, 20, 30, 40, 50, 60).Multiply (null, MatrixOrder.Append); + Assert.Throws (() => new Matrix (10, 20, 30, 40, 50, 60).Multiply (null, MatrixOrder.Append)); } [Test] @@ -416,11 +396,10 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void Multiply_InvalidOrder () { Matrix matrix = new Matrix (10, 20, 30, 40, 50, 60); - matrix.Multiply (new Matrix (10, 20, 30, 40, 50, 60), (MatrixOrder)Int32.MinValue); + Assert.Throws (() => matrix.Multiply (new Matrix (10, 20, 30, 40, 50, 60), (MatrixOrder)Int32.MinValue)); } [Test] @@ -513,10 +492,9 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void Scale_InvalidOrder () { - new Matrix ().Scale (2, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => new Matrix ().Scale (2, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -544,10 +522,9 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void Shear_InvalidOrder () { - new Matrix ().Shear (-1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => new Matrix ().Shear (-1, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -571,31 +548,27 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void TransformPoints_Point_Null () { - new Matrix ().TransformPoints ((Point[]) null); + Assert.Throws (() => new Matrix ().TransformPoints ((Point[]) null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void TransformPoints_PointF_Null () { - new Matrix ().TransformPoints ((PointF[]) null); + Assert.Throws (() => new Matrix ().TransformPoints ((PointF[]) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void TransformPoints_Point_Empty () { - new Matrix ().TransformPoints (new Point[0]); + Assert.Throws (() => new Matrix ().TransformPoints (new Point[0])); } [Test] - [ExpectedException (typeof (ArgumentException))] public void TransformPoints_PointF_Empty () { - new Matrix ().TransformPoints (new PointF[0]); + Assert.Throws (() => new Matrix ().TransformPoints (new PointF[0])); } [Test] @@ -619,31 +592,27 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void TransformVectors_Point_Null () { - new Matrix ().TransformVectors ((Point[]) null); + Assert.Throws (() => new Matrix ().TransformVectors ((Point[]) null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void TransformVectors_PointF_Null () { - new Matrix ().TransformVectors ((PointF[]) null); + Assert.Throws (() => new Matrix ().TransformVectors ((PointF[]) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void TransformVectors_Point_Empty () { - new Matrix ().TransformVectors (new Point[0]); + Assert.Throws (() => new Matrix ().TransformVectors (new Point[0])); } [Test] - [ExpectedException (typeof (ArgumentException))] public void TransformVectors_PointF_Empty () { - new Matrix ().TransformVectors (new PointF[0]); + Assert.Throws (() => new Matrix ().TransformVectors (new PointF[0])); } [Test] @@ -661,24 +630,21 @@ namespace MonoTests.System.Drawing.Drawing2D } [Test] - [ExpectedException (typeof (ArgumentException))] public void Translate_InvalidOrder () { - new Matrix ().Translate (-1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => new Matrix ().Translate (-1, 1, (MatrixOrder) Int32.MinValue)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void VectorTransformPoints_Null () { - new Matrix ().VectorTransformPoints ((Point[]) null); + Assert.Throws (() => new Matrix ().VectorTransformPoints ((Point[]) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void VectorTransformPoints_Empty () { - new Matrix ().VectorTransformPoints (new Point[0]); + Assert.Throws (() => new Matrix ().VectorTransformPoints (new Point[0])); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/GifCodecTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/GifCodecTest.cs index db88b4efc7..c259672451 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/GifCodecTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/GifCodecTest.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class GifCodecTest { /* Get suffix to add to the filename */ diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/IconCodecTest.cs.REMOVED.git-id b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/IconCodecTest.cs.REMOVED.git-id index 79dc0b2cf2..27f1f5a457 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/IconCodecTest.cs.REMOVED.git-id +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/IconCodecTest.cs.REMOVED.git-id @@ -1 +1 @@ -d8da270c896e548f1c3833281d02759fa8280aa5 \ No newline at end of file +31c8341496836d547566eaa10c9ed628d5763137 \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/MetafileTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/MetafileTest.cs index 56e96bc789..957a93d093 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/MetafileTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/MetafileTest.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class MetafileTest { public const string Bitmap = "bitmaps/non-inverted.bmp"; @@ -57,32 +56,28 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_Stream_Null () { - new Metafile ((Stream)null); + Assert.Throws (() => new Metafile ((Stream)null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Metafile_String_Null () { - new Metafile ((string) null); + Assert.Throws (() => new Metafile ((string) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_String_Empty () { - new Metafile (String.Empty); + Assert.Throws (() => new Metafile (String.Empty)); } [Test] - [ExpectedException (typeof (ExternalException))] public void Metafile_String_FileDoesNotExists () { string filename = getInFile ("telescope_02.wmf"); - new Metafile (filename); + Assert.Throws (() => new Metafile (filename)); } [Test] @@ -94,10 +89,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ExternalException))] public void GetMetafileHeader_Bitmap () { - new Metafile (getInFile (Bitmap)); + Assert.Throws (() => new Metafile (getInFile (Bitmap))); } static public void Check_MetaHeader_WmfPlaceable (MetaHeader mh) @@ -284,10 +278,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Static_GetMetafileHeader_Stream_Null () { - MetafileHeader header = Metafile.GetMetafileHeader ((Stream)null); + Assert.Throws (() => Metafile.GetMetafileHeader ((Stream)null)); } [Test] @@ -301,10 +294,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Static_GetMetafileHeader_Filename_Null () { - MetafileHeader header = Metafile.GetMetafileHeader ((string) null); + Assert.Throws (() => Metafile.GetMetafileHeader ((string) null)); } [Test] @@ -332,14 +324,12 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Static_GetMetafileHeader_IntPtr_Zero () { - Metafile.GetMetafileHeader (IntPtr.Zero); + Assert.Throws (() => Metafile.GetMetafileHeader (IntPtr.Zero)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Static_GetMetafileHeader_IntPtr () { string filename = MetafileTest.getInFile (MetafileTest.WmfPlaceable); @@ -348,22 +338,20 @@ namespace MonoTests.System.Drawing.Imaging { IntPtr hemf = mf.GetHenhmetafile (); Assert.IsTrue (hemf != IntPtr.Zero, "GetHenhmetafile"); - Metafile.GetMetafileHeader (hemf); + Assert.Throws (() => Metafile.GetMetafileHeader (hemf)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_IntPtrBool_Zero () { - new Metafile (IntPtr.Zero, false); + Assert.Throws (() => new Metafile (IntPtr.Zero, false)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_IntPtrEmfType_Zero () { - new Metafile (IntPtr.Zero, EmfType.EmfOnly); + Assert.Throws (() => new Metafile (IntPtr.Zero, EmfType.EmfOnly)); } private void CheckEmptyHeader (Metafile mf, EmfType type) @@ -407,10 +395,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_IntPtrEmfType_Invalid () { - Metafile_IntPtrEmfType ((EmfType)Int32.MinValue); + Assert.Throws (() => Metafile_IntPtrEmfType ((EmfType)Int32.MinValue)); } [Test] @@ -432,10 +419,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_IntPtrRectangle_Zero () { - new Metafile (IntPtr.Zero, new Rectangle (1, 2, 3, 4)); + Assert.Throws (() => new Metafile (IntPtr.Zero, new Rectangle (1, 2, 3, 4))); } [Test] @@ -456,10 +442,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_IntPtrRectangleF_Zero () { - new Metafile (IntPtr.Zero, new RectangleF (1, 2, 3, 4)); + Assert.Throws (() => new Metafile (IntPtr.Zero, new RectangleF (1, 2, 3, 4))); } [Test] @@ -496,10 +481,9 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Metafile_StreamIntPtrEmfType_Null () { - Metafile_StreamEmfType (null, EmfType.EmfOnly); + Assert.Throws (() => Metafile_StreamEmfType (null, EmfType.EmfOnly)); } [Test] @@ -511,11 +495,10 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Metafile_StreamIntPtrEmfType_Invalid () { using (MemoryStream ms = new MemoryStream ()) { - Metafile_StreamEmfType (ms, (EmfType)Int32.MinValue); + Assert.Throws (() => Metafile_StreamEmfType (ms, (EmfType)Int32.MinValue)); } } @@ -575,24 +558,21 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CreateFilename_MultipleGraphics_EmfOnly () { - CreateFilename (EmfType.EmfOnly, false); + Assert.Throws (() => CreateFilename (EmfType.EmfOnly, false)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CreateFilename_MultipleGraphics_EmfPlusDual () { - CreateFilename (EmfType.EmfPlusDual, false); + Assert.Throws (() => CreateFilename (EmfType.EmfPlusDual, false)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CreateFilename_MultipleGraphics_EmfPlusOnly () { - CreateFilename (EmfType.EmfPlusOnly, false); + Assert.Throws (() => CreateFilename (EmfType.EmfPlusOnly, false)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs index c7ee9e4201..15f0b09c16 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PngCodecTest { /* Get suffix to add to the filename */ diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs index 47c8947577..c39f30d39a 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs @@ -40,7 +40,6 @@ using System.Text; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class BmpCodecTest { /* Get suffix to add to the filename */ diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs index ecce1ac458..b80e8a548b 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs @@ -40,40 +40,36 @@ namespace MonoTests.System.Drawing.Imaging { public class ColorMatrixTest { [Test] - [ExpectedException (typeof (NullReferenceException))] public void Constructor_Null () { - new ColorMatrix (null); + Assert.Throws (() => new ColorMatrix (null)); } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void Constructor_TooSmallArraySize () { - new ColorMatrix (new float[][] { }); + Assert.Throws (() => new ColorMatrix (new float[][] { })); } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void Constructor_TooWideArraySize () { - new ColorMatrix (new float[][] { + Assert.Throws (() => new ColorMatrix (new float[][] { new float[] { 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f } - }); + })); } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void Constructor_TooTallArraySize () { - new ColorMatrix (new float[][] { + Assert.Throws (() => new ColorMatrix (new float[][] { new float[] { 0.0f }, new float[] { 1.0f }, new float[] { 2.0f }, new float[] { 3.0f }, new float[] { 4.0f }, new float[] { 5.0f } - }); + })); } [Test] @@ -116,7 +112,6 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (IndexOutOfRangeException))] public void TooBigItems () { ColorMatrix cm = new ColorMatrix (new float[][] { @@ -127,7 +122,7 @@ namespace MonoTests.System.Drawing.Imaging { new float[] { 4.0f, 4.1f, 4.2f, 4.3f, 4.4f, 4.5f }, new float[] { 5.0f, 5.1f, 5.2f, 5.3f, 5.4f, 5.5f } }); - Assert.AreEqual (5.5f, cm[5,5], "out"); + Assert.Throws (() => { var x = cm[5, 5]; }); } [Test] @@ -169,10 +164,10 @@ namespace MonoTests.System.Drawing.Imaging { { ColorMatrix cm = new ColorMatrix (new float[][] { new float[] {0.393f, 0.349f, 0.272f, 0, 0}, - new float[] {0.769f, 0.686f, 0.534f, 0, 0}, - new float[] {0.189f, 0.168f, 0.131f, 0, 0}, - new float[] { 0, 0, 0, 1, 0}, - new float[] { 0, 0, 0, 0, 1} + new float[] {0.769f, 0.686f, 0.534f, 0, 0}, + new float[] {0.189f, 0.168f, 0.131f, 0, 0}, + new float[] { 0, 0, 0, 1, 0}, + new float[] { 0, 0, 0, 0, 1} }); Assert.AreEqual (0.393f, cm.Matrix00, "00"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs index b4724040e1..87912ee310 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class ImageAttributesTest { static ColorMatrix global_color_matrix = new ColorMatrix (new float[][] { @@ -174,11 +173,10 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_Null () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (null); + Assert.Throws (() => ia.SetColorMatrix (null)); } } @@ -196,92 +194,82 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_Default_Any () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, ColorAdjustType.Any); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, ColorAdjustType.Any)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_Default_Count () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, ColorAdjustType.Count); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, ColorAdjustType.Count)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Any () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Any); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Any)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Bitmap () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Bitmap); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Bitmap)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Brush () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Brush); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Brush)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Count () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Count); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Count)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Default () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Default); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Default)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Pen () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Pen); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Pen)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_AltGrays_Text () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Text); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.AltGrays, ColorAdjustType.Text)); } } @@ -299,47 +287,42 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_SkipGrays_Any () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.SkipGrays, ColorAdjustType.Any); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.SkipGrays, ColorAdjustType.Any)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_SkipGrays_Count () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.SkipGrays, ColorAdjustType.Count); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.SkipGrays, ColorAdjustType.Count)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_InvalidFlag () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, (ColorMatrixFlag) Int32.MinValue); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, (ColorMatrixFlag) Int32.MinValue)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrix_InvalidType() { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, (ColorAdjustType)Int32.MinValue); + Assert.Throws (() => ia.SetColorMatrix (global_color_matrix, ColorMatrixFlag.Default, (ColorAdjustType)Int32.MinValue)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrices_Null_ColorMatrix () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrices (null, global_color_matrix); + Assert.Throws (() => ia.SetColorMatrices (null, global_color_matrix)); } } @@ -354,11 +337,10 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrices_ColorMatrix_Null_AltGrays () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrices (global_color_matrix, null, ColorMatrixFlag.AltGrays); + Assert.Throws (() => ia.SetColorMatrices (global_color_matrix, null, ColorMatrixFlag.AltGrays)); } } @@ -400,20 +382,18 @@ namespace MonoTests.System.Drawing.Imaging { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrices_InvalidFlags () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrices (global_color_matrix, global_color_matrix, (ColorMatrixFlag) Int32.MinValue); + Assert.Throws (() => ia.SetColorMatrices (global_color_matrix, global_color_matrix, (ColorMatrixFlag) Int32.MinValue)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetColorMatrices_InvalidType () { using (ImageAttributes ia = new ImageAttributes ()) { - ia.SetColorMatrices (global_color_matrix, global_color_matrix, ColorMatrixFlag.Default, (ColorAdjustType) Int32.MinValue); + Assert.Throws (() => ia.SetColorMatrices (global_color_matrix, global_color_matrix, ColorMatrixFlag.Default, (ColorAdjustType) Int32.MinValue)); } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs index 9644d8eedf..e20460eb99 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs @@ -38,7 +38,6 @@ using System.Security.Permissions; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class JpegCodecTest { /* Get suffix to add to the filename */ diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TiffCodecTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TiffCodecTest.cs index e207c0e9cd..39539a4635 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TiffCodecTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TiffCodecTest.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Imaging { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class TiffCodecTest { [TestFixtureSetUp] diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionCas.cs b/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionCas.cs index 3c2b8b5bd0..2687d712b7 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionCas.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionCas.cs @@ -52,31 +52,28 @@ namespace MonoCasTests.System.Drawing.Text { // TODO - tests for AddFontFile [Test] - [ExpectedException (typeof (SecurityException))] [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public void AddMemoryFont_Deny_UnmanagedCode () { - new PrivateFontCollection ().AddMemoryFont (IntPtr.Zero, 1024); + Assert.Throws (() => new PrivateFontCollection ().AddMemoryFont (IntPtr.Zero, 1024)); } [Test] - [ExpectedException (typeof (ArgumentException))] [SecurityPermission (SecurityAction.PermitOnly, UnmanagedCode = true)] public void AddMemoryFont_PermitOnly_UnmanagedCode () { - new PrivateFontCollection ().AddMemoryFont (IntPtr.Zero, 1024); + Assert.Throws (() => new PrivateFontCollection ().AddMemoryFont (IntPtr.Zero, 1024)); } // yes, that fails with FileNotFoundException ;-) [Test] - [ExpectedException (typeof (FileNotFoundException))] [SecurityPermission (SecurityAction.PermitOnly, UnmanagedCode = true)] public void AddMemoryFont_NegativeLength () { IntPtr ptr = Marshal.AllocHGlobal (1024); try { - new PrivateFontCollection ().AddMemoryFont (ptr, -1024); + Assert.Throws (() => new PrivateFontCollection ().AddMemoryFont (ptr, -1024)); } finally { Marshal.FreeHGlobal (ptr); @@ -84,13 +81,12 @@ namespace MonoCasTests.System.Drawing.Text { } [Test] - [ExpectedException (typeof (FileNotFoundException))] [SecurityPermission (SecurityAction.PermitOnly, UnmanagedCode = true)] public void AddMemoryFont_InvalidData () { IntPtr ptr = Marshal.AllocHGlobal (1024); try { - new PrivateFontCollection ().AddMemoryFont (ptr, 1024); + Assert.Throws (() => new PrivateFontCollection ().AddMemoryFont (ptr, 1024)); } finally { Marshal.FreeHGlobal (ptr); diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionTest.cs b/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionTest.cs index 4eed43bc81..48c601aea2 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Text/PrivateFontCollectionTest.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing.Text { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PrivateFontCollectionTest { [Test] @@ -49,40 +48,36 @@ namespace MonoTests.System.Drawing.Text { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void AddFontFile_Null () { - new PrivateFontCollection ().AddFontFile (null); + Assert.Throws (() => new PrivateFontCollection ().AddFontFile (null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void AddFontFile_Empty () { // badly formetted filename - new PrivateFontCollection ().AddFontFile (String.Empty); + Assert.Throws (() => new PrivateFontCollection ().AddFontFile (String.Empty)); } [Test] - [ExpectedException (typeof (FileNotFoundException))] [Category ("NotWorking")] // it seems fontconfig doesn't validate on add... public void AddFontFile_NotAFontFile () { string file = Path.GetTempFileName (); Assert.IsTrue (File.Exists (file), "Exists"); // even if the file exists.... - new PrivateFontCollection ().AddFontFile (file); + Assert.Throws (() => new PrivateFontCollection ().AddFontFile (file)); } // tests for AddMemoryFont are available in the CAS unit tests [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_Family () { PrivateFontCollection pfc = new PrivateFontCollection (); pfc.Dispose (); - Assert.IsNotNull (pfc.Families); + Assert.Throws (() => { var x = pfc.Families; }); // no it's not a ObjectDisposedException } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs index 34cb3aa190..b73ed00255 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class ColorConverterTest { Color col; @@ -167,72 +166,63 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFrom_x1 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "10, 20"); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "10, 20")); } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFrom_x2 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "-10, 20, 30"); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "-10, 20, 30")); } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFrom_x3 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - "1, 1, 1, 1, 1"); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + "1, 1, 1, 1, 1")); } [Test] - [ExpectedException (typeof (Exception))] public void ConvertFrom_x4 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - "*1, 1"); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + "*1, 1")); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_x5 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - new Point (10, 10)); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + new Point (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_x6 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - new PointF (10, 10)); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + new PointF (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_x7 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - new Size (10, 10)); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + new Size (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_x8 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, - new SizeF (10, 10)); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + new SizeF (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_x9 () { - colconv.ConvertFrom (null, CultureInfo.InvariantCulture, 0x10); + Assert.Throws (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, 0x10)); } [Test] @@ -264,43 +254,38 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_x1 () { - colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, - typeof (Color)); + Assert.Throws (() => colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, + typeof (Color))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_x2 () { - colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, - typeof (SizeF)); + Assert.Throws (() => colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, + typeof (SizeF))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_x3 () { - colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, - typeof (Point)); + Assert.Throws (() => colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, + typeof (Point))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_x4 () { - colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, - typeof (PointF)); + Assert.Throws (() => colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, + typeof (PointF))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_x5 () { - colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, - typeof (int)); + Assert.Throws (() => colconv.ConvertTo (null, CultureInfo.InvariantCulture, col, + typeof (int))); } [Test] @@ -351,10 +336,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromInvariantString_InvalidComponentCount () { - colconv.ConvertFromInvariantString ("1, 2, 3, 4, 5"); + Assert.Throws (() => colconv.ConvertFromInvariantString ("1, 2, 3, 4, 5")); } [Test] @@ -378,12 +362,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromString_InvalidComponentCount () { CultureInfo culture = CultureInfo.CurrentCulture; - colconv.ConvertFromString (string.Format (culture, - "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator[0])); + Assert.Throws (() => colconv.ConvertFromString (string.Format (culture, + "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator[0]))); } [Test] @@ -428,10 +411,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (Exception))] public void ConvertFromString_FromHtml_PoundTooLarge () { - colconv.ConvertFromString ("#100000000"); + Assert.Throws (() => colconv.ConvertFromString ("#100000000")); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs index 27ee0f5530..85401b1d04 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs @@ -84,24 +84,21 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (Exception))] public void FromHtml_PoundNegative () { - ColorTranslator.FromHtml ("#-1"); + Assert.Throws (() => ColorTranslator.FromHtml ("#-1")); } [Test] - [ExpectedException (typeof (Exception))] public void FromHtml_PoundTooLarge () { - ColorTranslator.FromHtml ("#100000000"); + Assert.Throws (() => ColorTranslator.FromHtml ("#100000000")); } [Test] - [ExpectedException (typeof (Exception))] public void FromHtml_Unknown () { - ColorTranslator.FromHtml ("unknown-color-test"); + Assert.Throws (() => ColorTranslator.FromHtml ("unknown-color-test")); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/FontFamilyTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/FontFamilyTest.cs index 3de56a5215..a0c0461424 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/FontFamilyTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/FontFamilyTest.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class FontFamilyTest { private Bitmap bitmap; @@ -59,18 +58,16 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void FontFamily_String_Null () { - new FontFamily (null); + Assert.Throws (() => new FontFamily (null)); } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] // libgdiplus/fontconfig always return something public void FontFamily_String_Empty () { - new FontFamily (String.Empty); + Assert.Throws (() => new FontFamily (String.Empty)); } private void CheckMono (FontFamily ff) @@ -110,10 +107,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void FontFamily_String_PrivateFontCollection () { - new FontFamily (name, new PrivateFontCollection ()); + Assert.Throws (() => new FontFamily (name, new PrivateFontCollection ())); } [Test] @@ -179,10 +175,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void GetFamilies_Null () { - FontFamily.GetFamilies (null); + Assert.Throws (() => FontFamily.GetFamilies (null)); } [Test] @@ -201,12 +196,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_UseAfter () { FontFamily ff = FontFamily.GenericMonospace; ff.Dispose (); - Assert.AreEqual (name, ff.Name, "Name"); + Assert.Throws (() => { var x = ff.Name; }); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs index d81f63c593..958aa0bb31 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs @@ -911,7 +911,6 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (FileNotFoundException))] public void GdipLoadImageFromFile_FileNotFound () { string filename = "filenotfound"; @@ -921,11 +920,10 @@ namespace MonoTests.System.Drawing { Assert.AreEqual (IntPtr.Zero, image, "image handle"); // this doesn't throw a OutOfMemoryException - Image.FromFile (filename); + Assert.Throws (() => Image.FromFile (filename)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void GdipCreateBitmapFromFile_FileNotFound () { string filename = "filenotfound"; @@ -934,7 +932,7 @@ namespace MonoTests.System.Drawing { Assert.AreEqual (Status.InvalidParameter, GDIPlus.GdipCreateBitmapFromFile (filename, out bitmap), "GdipCreateBitmapFromFile"); Assert.AreEqual (IntPtr.Zero, bitmap, "bitmap handle"); - new Bitmap (filename); + Assert.Throws (() => new Bitmap (filename)); } [Test] @@ -1182,8 +1180,8 @@ namespace MonoTests.System.Drawing { "DrawCurve with 1 pt"); Assert.AreEqual (Status.Ok, GDIPlus.GdipDrawCurveI (graphics, pen, - new Point [] { new Point (1, 1), - new Point (2, 2) }, 2), + new Point [] { new Point (1, 1), + new Point (2, 2) }, 2), "DrawCurve with 2 pts"); // DrawClosedCurve @@ -1193,12 +1191,12 @@ namespace MonoTests.System.Drawing { "DrawClosedCurve with no pts"); Assert.AreEqual (Status.InvalidParameter, GDIPlus.GdipDrawClosedCurveI (graphics, pen, - new Point [] { new Point (1, 1) }, 1), + new Point [] { new Point (1, 1) }, 1), "DrawClosedCurve with 1 pt"); Assert.AreEqual (Status.InvalidParameter, GDIPlus.GdipDrawClosedCurveI (graphics, pen, - new Point [] { new Point (1, 1), - new Point (2, 2) }, 2), + new Point [] { new Point (1, 1), + new Point (2, 2) }, 2), "DrawClosedCurve with 2 pt2"); // DrawPolygon @@ -1208,7 +1206,7 @@ namespace MonoTests.System.Drawing { "DrawPolygon with no pts"); Assert.AreEqual (Status.InvalidParameter, GDIPlus.GdipDrawPolygonI (graphics, pen, - new Point [] { new Point (1, 1) }, 1), + new Point [] { new Point (1, 1) }, 1), "DrawPolygon with only one pt"); GDIPlus.GdipDeletePen (pen); @@ -1224,12 +1222,12 @@ namespace MonoTests.System.Drawing { "FillClosedCurve with no pts"); Assert.AreEqual (Status.Ok, GDIPlus.GdipFillClosedCurveI (graphics, brush, - new Point [] { new Point (1, 1) }, 1), + new Point [] { new Point (1, 1) }, 1), "FillClosedCurve with 1 pt"); Assert.AreEqual (Status.Ok, GDIPlus.GdipFillClosedCurveI (graphics, brush, - new Point [] { new Point (1, 1), - new Point (2, 2) }, 2), + new Point [] { new Point (1, 1), + new Point (2, 2) }, 2), "FillClosedCurve with 2 pts"); GDIPlus.GdipDeleteBrush (brush); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/PenTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/PenTest.cs index 8ceeb112c5..7ecac3b574 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/PenTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/PenTest.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PenTest { private Pen default_pen; @@ -122,10 +121,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_Brush_Null () { - new Pen ((Brush) null); + Assert.Throws (() => new Pen ((Brush) null)); } [Test] @@ -138,10 +136,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_Brush_Float_Null () { - new Pen ((Brush) null, Single.MaxValue); + Assert.Throws (() => new Pen ((Brush) null, Single.MaxValue)); } [Test] @@ -212,10 +209,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void Alignment_Invalid () { - default_pen.Alignment = (PenAlignment) Int32.MinValue; + Assert.Throws (() => default_pen.Alignment = (PenAlignment) Int32.MinValue); } [Test] @@ -235,10 +231,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Brush_Null () { - default_pen.Brush = null; + Assert.Throws (() => default_pen.Brush = null); } [Test] @@ -253,11 +248,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] // not supported by libgdiplus public void CustomEndCap_Default () { - CustomLineCap clc = default_pen.CustomEndCap; + Assert.Throws (() => { var x = default_pen.CustomEndCap; }); } [Test] @@ -272,11 +266,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] // not supported by libgdiplus public void CustomStartCap_Default () { - CustomLineCap clc = default_pen.CustomStartCap; + Assert.Throws (() => { var x = default_pen.CustomStartCap; }); } [Test] @@ -293,10 +286,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void DashCap_Invalid () { - default_pen.DashCap = (DashCap) Int32.MinValue; + Assert.Throws (() => default_pen.DashCap = (DashCap) Int32.MinValue); } [Test] @@ -324,10 +316,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void DashPattern_Empty () { - default_pen.DashPattern = new float[0]; + Assert.Throws (() => default_pen.DashPattern = new float[0]); } [Test] @@ -342,10 +333,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void DashStyle_Invalid () { - default_pen.DashStyle = (DashStyle) Int32.MinValue; + Assert.Throws (() => default_pen.DashStyle = (DashStyle) Int32.MinValue); } [Test] @@ -428,11 +418,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (OutOfMemoryException))] [Category ("NotWorking")] // MS bug reported as FDBK50053 public void DashPattern_Default () { - float[] pattern = default_pen.DashPattern; + Assert.Throws (() => { var x = default_pen.DashPattern; }); } [Test] @@ -447,10 +436,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void EndCap_Invalid () { - default_pen.EndCap = (LineCap) Int32.MinValue; + Assert.Throws (() => default_pen.EndCap = (LineCap) Int32.MinValue); } [Test] @@ -465,10 +453,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void LineJoin_Invalid () { - default_pen.LineJoin = (LineJoin) Int32.MinValue; + Assert.Throws (() => default_pen.LineJoin = (LineJoin) Int32.MinValue); } [Test] @@ -496,25 +483,22 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (SC.InvalidEnumArgumentException))] public void StartCap_Invalid () { - default_pen.StartCap = (LineCap) Int32.MinValue; + Assert.Throws (() => default_pen.StartCap = (LineCap) Int32.MinValue); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Transform_Null () { - default_pen.Transform = null; + Assert.Throws (() => default_pen.Transform = null); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Transform_NonInvertible () { using (Pen p = new Pen (Brushes.Snow, Single.MaxValue)) { - p.Transform = new Matrix (123, 24, 82, 16, 47, 30); + Assert.Throws (() => p.Transform = new Matrix (123, 24, 82, 16, 47, 30)); } } @@ -541,12 +525,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose () { Pen p = new Pen (Brushes.Red); p.Dispose (); - p.Alignment = PenAlignment.Center; + Assert.Throws (() => p.Alignment = PenAlignment.Center); // exception but not an ObjectDisposedException } @@ -606,18 +589,16 @@ namespace MonoTests.System.Drawing { [Test] //[ExpectedException (typeof (ArgumentNullException))] // reported as FDBK50058 - [ExpectedException (typeof (NullReferenceException))] public void MultiplyTransform1_Null () { - default_pen.MultiplyTransform (null); + Assert.Throws (() => default_pen.MultiplyTransform (null)); } [Test] //[ExpectedException (typeof (ArgumentNullException))] // reported as FDBK50058 - [ExpectedException (typeof (NullReferenceException))] public void MultiplyTransform2_Null () { - default_pen.MultiplyTransform (null, MatrixOrder.Append); + Assert.Throws (() => default_pen.MultiplyTransform (null, MatrixOrder.Append)); } [Test] @@ -643,12 +624,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void MultiplyTransform_NonInvertible () { using (Matrix noninvertible = new Matrix (123, 24, 82, 16, 47, 30)) { using (Pen p = new Pen (Brushes.Red)) { - p.MultiplyTransform (noninvertible); + Assert.Throws (() => p.MultiplyTransform (noninvertible)); } } } @@ -685,10 +665,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void RotateTransform_InvalidOrder () { - default_pen.RotateTransform (720, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => default_pen.RotateTransform (720, (MatrixOrder) Int32.MinValue)); } [Test] @@ -725,10 +704,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ScaleTransform_InvalidOrder () { - default_pen.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => default_pen.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -756,10 +734,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void TranslateTransform_InvalidOrder () { - default_pen.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => default_pen.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/RegionDataTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/RegionDataTest.cs index 0b491065b6..e34bc84846 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/RegionDataTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/RegionDataTest.cs @@ -58,13 +58,12 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void RegionData_Null () { RegionData data = new Region ().GetRegionData (); data.Data = null; Assert.IsNull (data.Data, "Data"); - Region region = new Region (data); + Assert.Throws (() => new Region (data)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/SolidBrushTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/SolidBrushTest.cs index fda32858ec..b854d6f540 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/SolidBrushTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/SolidBrushTest.cs @@ -58,12 +58,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_Clone () { SolidBrush sb = new SolidBrush (Color.Transparent); sb.Dispose (); - sb.Clone (); + Assert.Throws (() => sb.Clone ()); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/SystemFontsTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/SystemFontsTest.cs index 6811e253df..9d8c73f321 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/SystemFontsTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/SystemFontsTest.cs @@ -130,13 +130,12 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_Instance () { Font f1 = SystemFonts.CaptionFont; float height = f1.GetHeight (72f); f1.Dispose (); - f1.GetHeight (72f); + Assert.Throws (() => f1.GetHeight (72f)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/SystemIconsTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/SystemIconsTest.cs index e99d108443..bc5a5d9e9d 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/SystemIconsTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/SystemIconsTest.cs @@ -62,14 +62,13 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ObjectDisposedException))] public void Clone_Dispose () { // Clones of SystemIcons icon's can be disposed Icon app = SystemIcons.Application; Icon clone = (Icon) app.Clone (); clone.Dispose (); - Assert.IsNotNull (clone.ToBitmap ()); + Assert.Throws (() => clone.ToBitmap ()); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs index 71fa94ba58..2d87ac21cd 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs @@ -36,7 +36,9 @@ using System.IO; using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; +#if !NETCOREAPP2_0 using System.Runtime.Serialization.Formatters.Soap; +#endif using System.Security.Cryptography; using System.Security.Permissions; using System.Text; @@ -46,7 +48,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class TestBitmap { [Test] @@ -121,30 +122,24 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void LockBits_IndexedWrite_NonIndexed () { using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format8bppIndexed)) { Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height); - bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb); + Assert.Throws (() => bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void LockBits_NonIndexedWrite_ToIndexed () { using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) { + BitmapData bd = new BitmapData (); Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height); - BitmapData bd = new BitmapData (); - try { - bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format8bppIndexed, bd); - } - catch (ArgumentException) { - // test to see if there's a leak or not in this case - Assert.AreEqual (IntPtr.Zero, bd.Scan0, "Scan0"); - throw; - } + Assert.Throws (() => bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format8bppIndexed, bd)); + + // test to see if there's a leak or not in this case + Assert.AreEqual (IntPtr.Zero, bd.Scan0, "Scan0"); } } @@ -182,14 +177,13 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidOperationException))] public void LockBits_Double () { using (Bitmap bmp = new Bitmap (10, 10, PixelFormat.Format24bppRgb)) { Rectangle r = new Rectangle (4, 4, 4, 4); BitmapData data = bmp.LockBits (r, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb); try { - bmp.LockBits (r, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb); + Assert.Throws (() => bmp.LockBits (r, ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb)); } finally { bmp.UnlockBits (data); @@ -198,17 +192,15 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void LockBits_Disposed () { Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb); Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height); bmp.Dispose (); - bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb); + Assert.Throws (() => bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb)); } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("Valgrind")] // this test is known to leak memory (API design limitation) public void UnlockBits_Disposed () { @@ -216,26 +208,24 @@ namespace MonoTests.System.Drawing { Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height); BitmapData data = bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppRgb); bmp.Dispose (); - bmp.UnlockBits (data); + Assert.Throws (() => bmp.UnlockBits (data)); // and that results in something like this when executed under Valgrind // "40,000 bytes in 1 blocks are possibly lost in loss record 88 of 92" } [Test] - [ExpectedException (typeof (ArgumentException))] public void UnlockBits_Null () { using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) { - bmp.UnlockBits (null); + Assert.Throws (() => bmp.UnlockBits (null)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void LockBits_BitmapData_Null () { using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) { Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height); - bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb, null); + Assert.Throws (() => bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb, null)); } } @@ -300,46 +290,42 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidOperationException))] public void Format1bppIndexed () { using (Bitmap bmp = new Bitmap (1, 1, PixelFormat.Format1bppIndexed)) { Color c = bmp.GetPixel (0, 0); Assert.AreEqual (-16777216, c.ToArgb (), "Color"); - bmp.SetPixel (0, 0, c); + Assert.Throws (() => bmp.SetPixel (0, 0, c)); } } [Test] - [ExpectedException (typeof (InvalidOperationException))] public void Format4bppIndexed () { using (Bitmap bmp = new Bitmap (1, 1, PixelFormat.Format4bppIndexed)) { Color c = bmp.GetPixel (0, 0); Assert.AreEqual (-16777216, c.ToArgb (), "Color"); - bmp.SetPixel (0, 0, c); + Assert.Throws (() => bmp.SetPixel (0, 0, c)); } } [Test] - [ExpectedException (typeof (InvalidOperationException))] public void Format8bppIndexed () { using (Bitmap bmp = new Bitmap (1, 1, PixelFormat.Format8bppIndexed)) { Color c = bmp.GetPixel (0, 0); Assert.AreEqual (-16777216, c.ToArgb (), "Color"); - bmp.SetPixel (0, 0, c); + Assert.Throws (() => bmp.SetPixel (0, 0, c)); } } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] // libgdiplus doesn't support this format public void Format16bppGrayScale () { using (Bitmap bmp = new Bitmap (1, 1, PixelFormat.Format16bppGrayScale)) { // and MS GDI+ support seems quite limited too - bmp.GetPixel (0, 0); + Assert.Throws (() => bmp.GetPixel (0, 0)); } } @@ -587,10 +573,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void FileDoesNotExists () { - Bitmap bmp = new Bitmap ("FileDoesNotExists.jpg"); + Assert.Throws (() => new Bitmap ("FileDoesNotExists.jpg")); } static string ByteArrayToString(byte[] arrInput) @@ -623,7 +608,7 @@ namespace MonoTests.System.Drawing { } } - hash = new MD5CryptoServiceProvider().ComputeHash (pixels); + hash = MD5.Create ().ComputeHash (pixels); return ByteArrayToString (hash); } public string RotateIndexedBmp (Bitmap src, RotateFlipType type) @@ -673,7 +658,7 @@ namespace MonoTests.System.Drawing { if (pixel_data == null) return "--ERROR--"; - byte[] hash = new MD5CryptoServiceProvider().ComputeHash (pixel_data); + byte[] hash = MD5.Create ().ComputeHash (pixel_data); return ByteArrayToString (hash); } @@ -1110,6 +1095,7 @@ namespace MonoTests.System.Drawing { } } +#if !NETCOREAPP2_0 private Stream SoapSerialize (object o) { MemoryStream ms = new MemoryStream (); @@ -1176,6 +1162,7 @@ namespace MonoTests.System.Drawing { } } } +#endif [Test] [Category ("NotWorking")] // http://bugzilla.ximian.com/show_bug.cgi?id=80558 @@ -1513,87 +1500,75 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void BitmapImageCtor () { - new Bitmap ((Image) null); + Assert.Throws (() => new Bitmap ((Image) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapImageSizeCtor () { - new Bitmap ((Image) null, Size.Empty); + Assert.Throws (() => new Bitmap ((Image) null, Size.Empty)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapImageIntIntCtor () { - new Bitmap ((Image) null, Int32.MinValue, Int32.MaxValue); + Assert.Throws (() => new Bitmap ((Image) null, Int32.MinValue, Int32.MaxValue)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapIntIntCtor () { - new Bitmap (Int32.MinValue, Int32.MaxValue); + Assert.Throws (() => new Bitmap (Int32.MinValue, Int32.MaxValue)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void BitmapIntIntGraphicCtor () { - new Bitmap (1, 1, null); + Assert.Throws (() => new Bitmap (1, 1, null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapIntIntPixelFormatCtor () { - new Bitmap (Int32.MinValue, Int32.MaxValue, PixelFormat.Format1bppIndexed); + Assert.Throws (() => new Bitmap (Int32.MinValue, Int32.MaxValue, PixelFormat.Format1bppIndexed)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapStreamCtor () { - new Bitmap ((Stream) null); + Assert.Throws (() => new Bitmap ((Stream) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapStreamBoolCtor () { - new Bitmap ((Stream) null, true); + Assert.Throws (() => new Bitmap ((Stream) null, true)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void BitmapStringCtor () { - new Bitmap ((string) null); + Assert.Throws (() => new Bitmap ((string) null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void BitmapStringBoolCtor () { - new Bitmap ((string) null, false); + Assert.Throws (() => new Bitmap ((string) null, false)); } [Test] - [ExpectedException (typeof (NullReferenceException))] public void BitmapTypeStringCtor1 () { - new Bitmap ((Type) null, "mono"); + Assert.Throws (() => new Bitmap ((Type) null, "mono")); } [Test] - [ExpectedException (typeof (ArgumentException))] public void BitmapTypeStringCtor2 () { - new Bitmap (typeof (Bitmap), null); + Assert.Throws (() => new Bitmap (typeof (Bitmap), null)); } private void SetResolution (float x, float y) @@ -1604,24 +1579,21 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetResolution_Zero () { - SetResolution (0.0f, 0.0f); + Assert.Throws (() => SetResolution (0.0f, 0.0f)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetResolution_Negative_X () { - SetResolution (-1.0f, 1.0f); + Assert.Throws (() => SetResolution (-1.0f, 1.0f)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetResolution_Negative_Y () { - SetResolution (1.0f, -1.0f); + Assert.Throws (() => SetResolution (1.0f, -1.0f)); } [Test] @@ -1637,17 +1609,15 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetResolution_NaN () { - SetResolution (Single.NaN, Single.NaN); + Assert.Throws (() => SetResolution (Single.NaN, Single.NaN)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void SetResolution_NegativeInfinity () { - SetResolution (Single.NegativeInfinity, Single.NegativeInfinity); + Assert.Throws (() => SetResolution (Single.NegativeInfinity, Single.NegativeInfinity)); } } @@ -1710,13 +1680,12 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] // libgdiplus has lost track of the original 1bpp state public void Hicon48 () { using (Icon icon = new Icon (TestBitmap.getInFile ("bitmaps/48x48x1.ico"))) { // looks like 1bbp icons aren't welcome as bitmaps ;-) - Bitmap.FromHicon (icon.Handle); + Assert.Throws (() => Bitmap.FromHicon (icon.Handle)); } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs index 6b922e2a71..4eb5b5b79c 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs @@ -48,12 +48,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose () { Brushes.YellowGreen.Dispose (); // a "normal" SolidBrush would throw an ArgumentException here - Brushes.YellowGreen.Clone (); + Assert.Throws (() => Brushes.YellowGreen.Clone ()); // and it is! so watch your brushes ;-) } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs index c5df6c531e..1b6eb6a89f 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs @@ -908,12 +908,12 @@ namespace MonoTests.System.Drawing { Assert.AreEqual (1.0f, Color.White.GetBrightness (), "BrightnessWhite"); Color c1 = Color.FromArgb (0, 13, 45, 7); //just some random color - Assert.IsTrue ( FloatsAlmostEqual (110.5263f, c1.GetHue ()), "Hue1"); + Assert.IsTrue (FloatsAlmostEqual (110.5263f, c1.GetHue ()), "Hue1"); Assert.IsTrue (FloatsAlmostEqual (0.1019608f, c1.GetBrightness ()), "Brightness1"); Assert.IsTrue (FloatsAlmostEqual (0.7307692f, c1.GetSaturation ()), "Saturation1"); Color c2 = Color.FromArgb (0, 112, 75, 29); //another random color - Assert.IsTrue ( FloatsAlmostEqual (33.25302f, c2.GetHue ()), "Hue2"); + Assert.IsTrue (FloatsAlmostEqual (33.25302f, c2.GetHue ()), "Hue2"); Assert.IsTrue (FloatsAlmostEqual (0.2764706f, c2.GetBrightness ()), "Brightness2"); Assert.IsTrue (FloatsAlmostEqual (0.5886525f, c2.GetSaturation ()), "Saturation2"); } @@ -1019,115 +1019,99 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidAlpha1 () { - Color.FromArgb (-1, Color.Red); + Assert.Throws (() => Color.FromArgb (-1, Color.Red)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidAlpha2 () { - Color.FromArgb (256, Color.Red); + Assert.Throws (() => Color.FromArgb (256, Color.Red)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidAlpha3 () { - Color.FromArgb (-1, 0, 0, 0); + Assert.Throws (() => Color.FromArgb (-1, 0, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidAlpha4 () { - Color.FromArgb (256, 0, 0, 0); + Assert.Throws (() => Color.FromArgb (256, 0, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidRed1 () { - Color.FromArgb (-1, 0, 0); + Assert.Throws (() => Color.FromArgb (-1, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidRed2 () { - Color.FromArgb (256, 0, 0); + Assert.Throws (() => Color.FromArgb (256, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidRed3 () { - Color.FromArgb (0, -1, 0, 0); + Assert.Throws (() => Color.FromArgb (0, -1, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidRed4 () { - Color.FromArgb (0, 256, 0, 0); + Assert.Throws (() => Color.FromArgb (0, 256, 0, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidGreen1 () { - Color.FromArgb (0, -1, 0); + Assert.Throws (() => Color.FromArgb (0, -1, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidGreen2 () { - Color.FromArgb (0, 256, 0); + Assert.Throws (() => Color.FromArgb (0, 256, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidGreen3 () { - Color.FromArgb (0, 0, -1, 0); + Assert.Throws (() => Color.FromArgb (0, 0, -1, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidGreen4 () { - Color.FromArgb (0, 0, 256, 0); + Assert.Throws (() => Color.FromArgb (0, 0, 256, 0)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidBlue1 () { - Color.FromArgb (0, 0, -1); + Assert.Throws (() => Color.FromArgb (0, 0, -1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidBlue2 () { - Color.FromArgb (0, 0, 256); + Assert.Throws (() => Color.FromArgb (0, 0, 256)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidBlue3 () { - Color.FromArgb (0, 0, 0, -1); + Assert.Throws (() => Color.FromArgb (0, 0, 0, -1)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromArgb_InvalidBlue4 () { - Color.FromArgb (0, 0, 0, 256); + Assert.Throws (() => Color.FromArgb (0, 0, 0, 256)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs index 50c2f83271..e1f3660f70 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs @@ -120,7 +120,6 @@ namespace MonoTests.System.Drawing{ [Test] [Category ("CAS")] - [ExpectedException (typeof (SecurityException))] [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public void ToLogFont_DenyUnmanagedCode () { @@ -130,7 +129,7 @@ namespace MonoTests.System.Drawing{ lf = new LOGFONT(); f = new Font("Arial", 10); - f.ToLogFont(lf); + Assert.Throws (() => f.ToLogFont(lf)); } [Test] @@ -167,12 +166,11 @@ namespace MonoTests.System.Drawing{ [Test] [SecurityPermission (SecurityAction.Assert, UnmanagedCode = true)] - [ExpectedException (typeof (ArgumentException))] public void ToLogFont_TooSmall () { Font f = new Font ("Arial", 10); object o = new object (); - f.ToLogFont (o); + Assert.Throws (() => f.ToLogFont (o)); // no PInvoke conversion exists !?!? } @@ -188,11 +186,10 @@ namespace MonoTests.System.Drawing{ [Test] [SecurityPermission (SecurityAction.Assert, UnmanagedCode = true)] - [ExpectedException (typeof (AccessViolationException))] public void ToLogFont_Null () { Font f = new Font ("Arial", 10); - f.ToLogFont (null); + Assert.Throws (() => f.ToLogFont (null)); } [Test] public void Font_StringNull_Float () @@ -260,10 +257,9 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void Font_String_Float_FontStyle_GraphicsUnit_Display () { - new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Display); + Assert.Throws (() => new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Display)); } [Test] @@ -303,19 +299,17 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Font_FontFamilyNull_Float () { FontFamily ff = null; - new Font (ff, 12.5f); + Assert.Throws (() => new Font (ff, 12.5f)); } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Font_FontNull_FontStyle () { Font f = null; - new Font (f, FontStyle.Bold); + Assert.Throws (() => new Font (f, FontStyle.Bold)); } [Test] @@ -373,10 +367,9 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Display () { - new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Display); + Assert.Throws (() => new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Display)); } [Test] @@ -435,22 +428,20 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_Height () { Font f = new Font (name, 12.5f); f.Dispose (); - Assert.AreEqual (0, f.Height, "Name"); + Assert.Throws (() => { var x = f.Height; }); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_ToLogFont () { Font f = new Font (name, 12.5f); f.Dispose (); LOGFONT lf = new LOGFONT(); - f.ToLogFont (lf); + Assert.Throws (() => f.ToLogFont (lf)); } [Test] @@ -503,22 +494,20 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_ToHFont () { Font f = new Font (name, 12.5f); f.Dispose (); - f.ToHfont (); + Assert.Throws (() => f.ToHfont ()); } [Test] - [ExpectedException (typeof (ArgumentException))] [Category ("NotWorking")] public void UnavailableStyleException () { // Marked NotWorking because it is dependent on what fonts/styles are available // on the OS. This test is written for Windows. - Font f = new Font ("Monotype Corsiva", 8, FontStyle.Regular); + Assert.Throws (() => new Font ("Monotype Corsiva", 8, FontStyle.Regular)); } [Test] @@ -547,11 +536,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void GetHeight_Graphics_Null () { using (Font f = new Font (name, 12.5f)) { - Assert.AreEqual (0, f.GetHeight (null), "0"); + Assert.Throws (() => f.GetHeight (null)); } } @@ -566,36 +554,36 @@ namespace MonoTests.System.Drawing{ Assert.IsFalse (f1.GetHashCode () == f3.GetHashCode (), "2) Fonts with different styles should have different HashCodes"); } - [Test] - public void GetHashCode_UnitDiffers_HashesNotEqual() - { - Font f1 = new Font("Arial", 8.25F, GraphicsUnit.Point); - Font f2 = new Font("Arial", 8.25F, GraphicsUnit.Pixel); + [Test] + public void GetHashCode_UnitDiffers_HashesNotEqual() + { + Font f1 = new Font("Arial", 8.25F, GraphicsUnit.Point); + Font f2 = new Font("Arial", 8.25F, GraphicsUnit.Pixel); - Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(), - "Hashcodes should differ if _unit member differs"); - } + Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(), + "Hashcodes should differ if _unit member differs"); + } - [Test] - public void GetHashCode_NameDiffers_HashesNotEqual() - { - Font f1 = new Font("Arial", 8.25F, GraphicsUnit.Point); - Font f2 = new Font("Courier New", 8.25F, GraphicsUnit.Point); + [Test] + public void GetHashCode_NameDiffers_HashesNotEqual() + { + Font f1 = new Font("Arial", 8.25F, GraphicsUnit.Point); + Font f2 = new Font("Courier New", 8.25F, GraphicsUnit.Point); if (f1.Name != f2.Name) { Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(), "Hashcodes should differ if _name member differs"); } - } + } - [Test] - public void GetHashCode_StyleEqualsGdiCharSet_HashesNotEqual() - { - Font f1 = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - Font f2 = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(1))); + [Test] + public void GetHashCode_StyleEqualsGdiCharSet_HashesNotEqual() + { + Font f1 = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + Font f2 = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(1))); - Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(), - "Hashcodes should differ if _style member differs"); - } + Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(), + "Hashcodes should differ if _style member differs"); + } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestFontConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestFontConverter.cs index 08264e3f54..1fcacd6a35 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestFontConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestFontConverter.cs @@ -47,21 +47,19 @@ namespace MonoTests.System.Drawing{ Assert.IsTrue (f.GetStandardValuesSupported (), "standard values supported"); Assert.IsFalse (f.GetStandardValuesExclusive (), "standard values exclusive"); } - - [ExpectedException (typeof (NotSupportedException))] + [Test] public void ExTestConvertFrom () { FontConverter.FontNameConverter f = new FontConverter.FontNameConverter (); - f.ConvertFrom (null); + Assert.Throws (() => f.ConvertFrom (null)); } - [ExpectedException (typeof (NotSupportedException))] [Test] public void ExTestConvertFrom2 () { FontConverter.FontNameConverter f = new FontConverter.FontNameConverter (); - f.ConvertFrom (1); + Assert.Throws (() => f.ConvertFrom (1)); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestGraphics.cs.REMOVED.git-id b/mcs/class/System.Drawing/Test/System.Drawing/TestGraphics.cs.REMOVED.git-id index 206abdb321..a269f7ce7d 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestGraphics.cs.REMOVED.git-id +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestGraphics.cs.REMOVED.git-id @@ -1 +1 @@ -6f8e3a61406915c6979749fd17fd232663f9df4f \ No newline at end of file +479736c63f90ed7a8aa90c833802c23e0eae7c67 \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs index b24af54e3d..5473adbf91 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs @@ -29,6 +29,7 @@ // using System; +using System.ComponentModel; using System.Drawing; using System.Drawing.Imaging; using System.IO; @@ -39,7 +40,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class IconTest { Icon icon; @@ -93,10 +93,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_IconNull_Int_Int () { - new Icon ((Icon)null, 32, 32); + Assert.Throws (() => new Icon ((Icon)null, 32, 32)); } [Test] @@ -108,10 +107,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_IconNull_Size () { - new Icon ((Icon) null, new Size (32, 32)); + Assert.Throws (() => new Icon ((Icon) null, new Size (32, 32))); } [Test] @@ -173,58 +171,50 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_StreamNull () { - new Icon ((Stream) null); + Assert.Throws (() => new Icon ((Stream) null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_StreamNull_Int_Int () { - new Icon ((Stream) null, 32, 32); + Assert.Throws (() => new Icon ((Stream) null, 32, 32)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_StringNull () { - new Icon ((string) null); + Assert.Throws (() => new Icon ((string) null)); } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Constructor_TypeNull_String () { - new Icon ((Type) null, "mono.ico"); + Assert.Throws (() => new Icon ((Type) null, "mono.ico")); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_Type_StringNull () { - new Icon (typeof (Icon), null); + Assert.Throws (() => new Icon (typeof (Icon), null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void Constructor_StreamNull_Size () { - new Icon ((Stream) null, new Size (32, 32)); + Assert.Throws (() => new Icon ((Stream) null, new Size (32, 32))); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_StringNull_Size () { - new Icon ((string) null, new Size (32, 32)); + Assert.Throws (() => new Icon ((string) null, new Size (32, 32))); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_StringNull_Int_Int () { - new Icon ((string) null, 32, 32); + Assert.Throws (() => new Icon ((string) null, 32, 32)); } [Test] @@ -380,10 +370,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (NullReferenceException))] public void Save_Null () { - icon.Save (null); + Assert.Throws (() => icon.Save (null)); } [Test] @@ -499,34 +488,31 @@ namespace MonoTests.System.Drawing { } } - [Test, ExpectedException ()] //ToDo: System.ComponentModel.Win32Exception + [Test] public void Only256InFile () { using (FileStream fs = File.OpenRead (TestBitmap.getInFile ("bitmaps/only256.ico"))) { - Icon icon = new Icon (fs, 0, 0); + Assert.Throws (() => new Icon (fs, 0, 0)); } } [Test] - [ExpectedException (typeof (ArgumentException))] public void ExtractAssociatedIcon_Null () { - Icon.ExtractAssociatedIcon (null); + Assert.Throws (() => Icon.ExtractAssociatedIcon (null)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void ExtractAssociatedIcon_Empty () { - Icon.ExtractAssociatedIcon (String.Empty); + Assert.Throws (() => Icon.ExtractAssociatedIcon (String.Empty)); } [Test] - [ExpectedException (typeof (FileNotFoundException))] public void ExtractAssociatedIcon_DoesNotExists () { - Icon.ExtractAssociatedIcon ("does-not-exists.png"); + Assert.Throws (() => Icon.ExtractAssociatedIcon ("does-not-exists.png")); } private static bool RunningOnUnix { diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs index 6fcfadabe4..5337d64b41 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs @@ -42,7 +42,6 @@ using System.Security.Permissions; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class IconConverterTest { Icon icon; diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestImage.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestImage.cs index e064a4337a..c0289aedd2 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestImage.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestImage.cs @@ -40,7 +40,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing{ [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class ImageTest { private string fname; @@ -69,10 +68,9 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (FileNotFoundException))] public void FileDoesNotExists () { - Image.FromFile ("FileDoesNotExists.jpg"); + Assert.Throws (() => Image.FromFile ("FileDoesNotExists.jpg")); } private bool CallbackTrue () @@ -101,20 +99,18 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void GetThumbnailImage_Height_Zero () { using (Bitmap bmp = new Bitmap (10, 10)) { - Image tn = bmp.GetThumbnailImage (5, 0, new Image.GetThumbnailImageAbort (CallbackFalse), IntPtr.Zero); + Assert.Throws (() => bmp.GetThumbnailImage (5, 0, new Image.GetThumbnailImageAbort (CallbackFalse), IntPtr.Zero)); } } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void GetThumbnailImage_Width_Negative () { using (Bitmap bmp = new Bitmap (10, 10)) { - Image tn = bmp.GetThumbnailImage (-5, 5, new Image.GetThumbnailImageAbort (CallbackFalse), IntPtr.Zero); + Assert.Throws (() => bmp.GetThumbnailImage (-5, 5, new Image.GetThumbnailImageAbort (CallbackFalse), IntPtr.Zero)); } } @@ -245,13 +241,12 @@ namespace MonoTests.System.Drawing{ [Test] [Category ("NotWorking")] // https://bugzilla.novell.com/show_bug.cgi?id=338779 - [ExpectedException (typeof (ArgumentException))] public void FromStream_Metafile_Wmf_NotOrigin () { string filename = TestBitmap.getInFile ("bitmaps/telescope_01.wmf"); using (FileStream fs = File.OpenRead (filename)) { fs.Position = fs.Length / 2; - Image.FromStream (fs); + Assert.Throws (() => Image.FromStream (fs)); } } @@ -287,31 +282,28 @@ namespace MonoTests.System.Drawing{ [Test] [Category ("NotWorking")] // https://bugzilla.novell.com/show_bug.cgi?id=338779 - [ExpectedException (typeof (ArgumentException))] public void FromStream_Metafile_Emf_NotOrigin () { string filename = TestBitmap.getInFile ("bitmaps/milkmateya01.emf"); using (FileStream fs = File.OpenRead (filename)) { fs.Position = fs.Length / 2; - Image.FromStream (fs); + Assert.Throws (() => Image.FromStream (fs)); } } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void FromFile_Invalid () { string filename = Assembly.GetExecutingAssembly ().Location; - Image.FromFile (filename); + Assert.Throws (() => Image.FromFile (filename)); } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromStream_Invalid () { string filename = Assembly.GetExecutingAssembly ().Location; using (FileStream fs = File.OpenRead (filename)) { - Image.FromStream (fs); + Assert.Throws (() => Image.FromStream (fs)); } } @@ -350,7 +342,6 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void StreamJunkSaveLoad () { using (MemoryStream ms = new MemoryStream ()) { @@ -363,7 +354,7 @@ namespace MonoTests.System.Drawing{ bmp.Save (ms, ImageFormat.Bmp); Assert.IsTrue (ms.Position > 2, "Position-2"); // exception here - Image.FromStream (ms); + Assert.Throws (() => Image.FromStream (ms)); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs index ef4752ae03..0e41e411a4 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs @@ -41,7 +41,6 @@ using System.Security.Permissions; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class ImageConverterTest { Image image; @@ -157,87 +156,75 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_BadString () { - imgConv.ConvertFrom ("System.Drawing.String"); + Assert.Throws (() => imgConv.ConvertFrom ("System.Drawing.String")); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_BadString_WithCulture () { - imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, "System.Drawing.String"); + Assert.Throws (() => imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, "System.Drawing.String")); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_Bitmap () { - imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Bitmap (20, 20)); + Assert.Throws (() => imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Bitmap (20, 20))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_Point () { - imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Point (10, 10)); + Assert.Throws (() => imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Point (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_SizeF () { - imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new SizeF (10, 10)); + Assert.Throws (() => imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new SizeF (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertFrom_Object () { - imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Object ()); + Assert.Throws (() => imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, new Object ())); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_BadString () { - imgConvFrmTD.ConvertFrom ("System.Drawing.String"); + Assert.Throws (() => imgConvFrmTD.ConvertFrom ("System.Drawing.String")); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_BadString_Culture () { - imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, "System.Drawing.String"); + Assert.Throws (() => imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, "System.Drawing.String")); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_Bitmap () { - imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Bitmap (20, 20)); + Assert.Throws (() => imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Bitmap (20, 20))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_Point () { - imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Point (10, 10)); + Assert.Throws (() => imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Point (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_SizeF () { - imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new SizeF (10, 10)); + Assert.Throws (() => imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new SizeF (10, 10))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertFrom_Object () { - imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Object ()); + Assert.Throws (() => imgConvFrmTD.ConvertFrom (null, CultureInfo.InvariantCulture, new Object ())); } [Test] @@ -278,115 +265,99 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Rectangle () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Rectangle)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Rectangle))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Image () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, image.GetType ()); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, image.GetType ())); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Size () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Size)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Size))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Bitmap () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Bitmap)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Bitmap))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Point () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Point)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Point))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Metafile () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Metafile)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Metafile))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Object () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Object)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Object))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void ConvertTo_Int () { - imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (int)); + Assert.Throws (() => imgConv.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (int))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Rectangle () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Rectangle)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Rectangle))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Image () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, image.GetType ()); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, image.GetType ())); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Size () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Size)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Size))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Bitmap () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Bitmap)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Bitmap))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Point () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Point)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Point))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Metafile () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Metafile)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Metafile))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Object () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Object)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (Object))); } [Test] - [ExpectedException (typeof (NotSupportedException))] public void TypeDescriptor_ConvertTo_Int () { - imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (int)); + Assert.Throws (() => imgConvFrmTD.ConvertTo (null, CultureInfo.InvariantCulture, image, typeof (int))); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestImageFormatConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestImageFormatConverter.cs index dcc2539a3c..33edbb4b85 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestImageFormatConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestImageFormatConverter.cs @@ -39,7 +39,6 @@ using System.Security.Permissions; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class ImageFormatConverterTest { ImageFormat imageFmt; diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs index 346ae6f1d5..a12a498f81 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs @@ -66,7 +66,9 @@ namespace MonoTests.System.Drawing{ [Test] public void EqualityOpTest () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (pt1_1 == pt1_1, "#1"); +#pragma warning restore 1718 Assert.IsTrue (pt1_1 == new Point (1, 1), "#2"); Assert.IsTrue (!(pt1_1 == pt1_0), "#3"); Assert.IsTrue (!(pt1_1 == pt0_1), "#4"); @@ -76,7 +78,9 @@ namespace MonoTests.System.Drawing{ [Test] public void InequalityOpTest () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (!(pt1_1 != pt1_1), "#1"); +#pragma warning restore 1718 Assert.IsTrue (!(pt1_1 != new Point (1, 1)), "#2"); Assert.IsTrue (pt1_1 != pt1_0, "#3"); Assert.IsTrue (pt1_1 != pt0_1, "#4"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs index 0a0a6d0914..a45a24942c 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs @@ -41,7 +41,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PointConverterTest { Point pt; @@ -222,7 +221,7 @@ namespace MonoTests.System.Drawing try { // culture == null ptconv.ConvertTo (null, null, pt, typeof (string)); - } catch (NullReferenceException e) { + } catch (NullReferenceException) { Assert.Fail ("CT#8: must not throw NullReferenceException"); } } @@ -253,13 +252,12 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void TestCreateInstance_CaseSensitive () { Hashtable ht = new Hashtable (); ht.Add ("x", 2); ht.Add ("Y", 3); - ptconv.CreateInstance (null, ht); + Assert.Throws (() => ptconv.CreateInstance (null, ht)); } [Test] @@ -305,10 +303,9 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromInvariantString_string_exc_1 () { - ptconv.ConvertFromInvariantString ("1"); + Assert.Throws (() => ptconv.ConvertFromInvariantString ("1")); } [Test] @@ -341,10 +338,9 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromString_string_exc_1 () { - ptconv.ConvertFromString ("1"); + Assert.Throws (() => ptconv.ConvertFromString ("1")); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPointF.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPointF.cs index 43f18d14d1..f2f7715f22 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestPointF.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPointF.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class PointFTest { PointF pt11_99; @@ -104,7 +103,9 @@ namespace MonoTests.System.Drawing [Test] public void TestEqualityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (pt11_99 == pt11_99, "EOP#1"); +#pragma warning restore 1718 Assert.IsTrue (pt11_99 == new PointF (1.1F, 9.9F), "EOP#2"); Assert.IsFalse (pt11_99 == pt11_0, "EOP#3"); Assert.IsFalse (pt11_99 == pt0_11, "EOP#4"); @@ -114,7 +115,9 @@ namespace MonoTests.System.Drawing [Test] public void TestInequalityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsFalse (pt11_99 != pt11_99, "IOP#1"); +#pragma warning restore 1718 Assert.IsFalse (pt11_99 != new PointF (1.1F, 9.9F), "IOP#2"); Assert.IsTrue (pt11_99 != pt11_0, "IOP#3"); Assert.IsTrue (pt11_99 != pt0_11, "IOP#4"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs index aa0b9e68ae..bc05d22453 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs @@ -42,7 +42,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class RectangleConverterTest { Rectangle rect; @@ -305,7 +304,6 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void TestCreateInstance_CaseSensitive () { Hashtable ht = new Hashtable (); @@ -313,7 +311,7 @@ namespace MonoTests.System.Drawing ht.Add ("Y", -10); ht.Add ("Width", 20); ht.Add ("Height", 30); - rconv.CreateInstance (null, ht); + Assert.Throws (() => rconv.CreateInstance (null, ht)); } [Test] @@ -374,10 +372,9 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromInvariantString_string_exc_1 () { - rconv.ConvertFromInvariantString ("1, 2, 3"); + Assert.Throws (() => rconv.ConvertFromInvariantString ("1, 2, 3")); } [Test] @@ -410,12 +407,11 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromString_string_exc_1 () { CultureInfo culture = CultureInfo.CurrentCulture; - rconv.ConvertFromString (string.Format(culture, - "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator)); + Assert.Throws (() => rconv.ConvertFromString (string.Format(culture, + "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator))); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs index d57515cab0..86f99ad338 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs @@ -1048,35 +1048,31 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_GraphicsPath_Null () { GraphicsPath gp = null; - Region r = new Region (gp); + Assert.Throws (() => new Region (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Constructor_RegionData_Null () { RegionData rd = null; - Region r = new Region (rd); + Assert.Throws (() => new Region (rd)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Union_GraphicsPath_Null () { GraphicsPath gp = null; - new Region ().Union (gp); + Assert.Throws (() => new Region ().Union (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Union_Region_Null () { Region r = null; - new Region ().Union (r); + Assert.Throws (() => new Region ().Union (r)); } [Test] @@ -1091,74 +1087,65 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Intersect_GraphicsPath_Null () { GraphicsPath gp = null; - new Region ().Intersect (gp); + Assert.Throws (() => new Region ().Intersect (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Intersect_Region_Null () { Region r = null; - new Region ().Intersect (r); + Assert.Throws (() => new Region ().Intersect (r)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Complement_GraphicsPath_Null () { GraphicsPath gp = null; - new Region ().Complement (gp); + Assert.Throws (() => new Region ().Complement (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Complement_Region_Null () { Region r = null; - new Region ().Complement (r); + Assert.Throws (() => new Region ().Complement (r)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Exclude_GraphicsPath_Null () { GraphicsPath gp = null; - new Region ().Exclude (gp); + Assert.Throws (() => new Region ().Exclude (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Exclude_Region_Null () { Region r = null; - new Region ().Exclude (r); + Assert.Throws (() => new Region ().Exclude (r)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Xor_GraphicsPath_Null () { GraphicsPath gp = null; - new Region ().Xor (gp); + Assert.Throws (() => new Region ().Xor (gp)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Xor_Region_Null () { Region r = null; - new Region ().Xor (r); + Assert.Throws (() => new Region ().Xor (r)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void GetBounds_Null () { - new Region ().GetBounds (null); + Assert.Throws (() => new Region ().GetBounds (null)); } [Test] @@ -1214,53 +1201,46 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void IsEmpty_Null () { - new Region ().IsEmpty (null); + Assert.Throws (() => new Region ().IsEmpty (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void IsInfinite_Null () { - new Region ().IsInfinite (null); + Assert.Throws (() => new Region ().IsInfinite (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Equals_NullGraphics () { - new Region ().Equals (null, Graphics.FromImage (new Bitmap (10, 10))); + Assert.Throws (() => new Region ().Equals (null, Graphics.FromImage (new Bitmap (10, 10)))); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Equals_RegionNull () { - new Region ().Equals (new Region (), null); + Assert.Throws (() => new Region ().Equals (new Region (), null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] [Category ("NotWorking")] // caused regression in SWF public void GetHrgn_Null () { - new Region ().GetHrgn (null); + Assert.Throws (() => new Region ().GetHrgn (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void GetRegionScans_Null () { - new Region ().GetRegionScans (null); + Assert.Throws (() => new Region ().GetRegionScans (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Transform_Null () { - new Region ().Transform (null); + Assert.Throws (() => new Region ().Transform (null)); } // an "empty ctor" Region is infinite @@ -1575,17 +1555,15 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void FromHrgn_Zero () { - Region.FromHrgn (IntPtr.Zero); + Assert.Throws (() => Region.FromHrgn (IntPtr.Zero)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void ReleaseHrng_Zero () { Region r = new Region (new GraphicsPath ()); - r.ReleaseHrgn (IntPtr.Zero); + Assert.Throws (() => r.ReleaseHrgn (IntPtr.Zero)); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSize.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSize.cs index 335bcbca3f..87862ab74f 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSize.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSize.cs @@ -142,7 +142,9 @@ namespace MonoTests.System.Drawing [Test] public void TestEqualityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (sz1_1 == sz1_1, "EOP#1"); +#pragma warning restore 1718 Assert.IsTrue (sz1_1 == new Size (1, 1), "EOP#2"); Assert.IsTrue (! (sz1_1 == sz1_0), "EOP#3"); Assert.IsTrue (! (sz1_1 == sz0_1), "EOP#4"); @@ -152,7 +154,9 @@ namespace MonoTests.System.Drawing [Test] public void TestInequalityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (! (sz1_1 != sz1_1), "IOP#1"); +#pragma warning restore 1718 Assert.IsTrue (! (sz1_1 != new Size (1, 1)), "IOP#2"); Assert.IsTrue (sz1_1 != sz1_0, "IOP#3"); Assert.IsTrue (sz1_1 != sz0_1, "IOP#4"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs index 7e10230544..d6cc2e1159 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs @@ -42,7 +42,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class SizeConverterTest { Size sz; @@ -225,7 +224,7 @@ namespace MonoTests.System.Drawing try { // culture == null szconv.ConvertTo (null, null, sz, typeof (string)); - } catch (NullReferenceException e) { + } catch (NullReferenceException) { Assert.Fail ("CT#8: must not throw NullReferenceException"); } } @@ -256,13 +255,12 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void TestCreateInstance_CaseSensitive () { Hashtable ht = new Hashtable (); ht.Add ("width", 20); ht.Add ("Height", 30); - szconv.CreateInstance (null, ht); + Assert.Throws (() => szconv.CreateInstance (null, ht)); } [Test] @@ -310,10 +308,9 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromInvariantString_string_exc_1 () { - szconv.ConvertFromInvariantString ("1, 2, 3"); + Assert.Throws (() => szconv.ConvertFromInvariantString ("1, 2, 3")); } [Test] @@ -346,12 +343,11 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromString_string_exc_1 () { CultureInfo culture = CultureInfo.CurrentCulture; - szconv.ConvertFromString (string.Format(culture, - "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator)); + Assert.Throws (() => szconv.ConvertFromString (string.Format(culture, + "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator))); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeF.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeF.cs index dc94bcf1a1..5ec35bb564 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeF.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeF.cs @@ -39,7 +39,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class SizeFTest { SizeF sz11_99; @@ -132,7 +131,9 @@ namespace MonoTests.System.Drawing [Test] public void TestEqualityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsTrue (sz11_99 == sz11_99, "EOP#1"); +#pragma warning restore 1718 Assert.IsTrue (sz11_99 == new SizeF (1.1F, 9.9F), "EOP#2"); Assert.IsFalse (sz11_99 == sz11_0, "EOP#3"); Assert.IsFalse (sz11_99 == sz0_11, "EOP#4"); @@ -142,7 +143,9 @@ namespace MonoTests.System.Drawing [Test] public void TestInequalityOp () { +#pragma warning disable 1718 // Comparison made to same variable Assert.IsFalse (sz11_99 != sz11_99, "IOP#1"); +#pragma warning restore 1718 Assert.IsFalse (sz11_99 != new SizeF (1.1F, 9.9F), "IOP#2"); Assert.IsTrue (sz11_99 != sz11_0, "IOP#3"); Assert.IsTrue (sz11_99 != sz0_11, "IOP#4"); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs index 3277b2281c..95b4483f83 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs @@ -43,7 +43,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class SizeFConverterTest { SizeF sz; @@ -250,23 +249,21 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (InvalidCastException))] public void TestCreateInstance_Int () { Hashtable ht = new Hashtable (); ht.Add ("Width", 10); ht.Add ("Height", 20); - szconv.CreateInstance (null, ht); + Assert.Throws (() => szconv.CreateInstance (null, ht)); } [Test] - [ExpectedException (typeof (NullReferenceException))] public void TestCreateInstance_CaseSensitive () { Hashtable ht = new Hashtable (); ht.Add ("width", 20); ht.Add ("Height", 30); - szconv.CreateInstance (null, ht); + Assert.Throws (() => szconv.CreateInstance (null, ht)); } [Test] @@ -314,10 +311,9 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromInvariantString_string_exc_1 () { - szconv.ConvertFromInvariantString ("1, 2, 3"); + Assert.Throws (() => szconv.ConvertFromInvariantString ("1, 2, 3")); } [Test] @@ -350,12 +346,11 @@ namespace MonoTests.System.Drawing } [Test] - [ExpectedException (typeof (ArgumentException))] public void ConvertFromString_string_exc_1 () { CultureInfo culture = CultureInfo.CurrentCulture; - szconv.ConvertFromString (string.Format(culture, - "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator)); + Assert.Throws (() => szconv.ConvertFromString (string.Format(culture, + "1{0} 2{0} 3{0} 4{0} 5", culture.TextInfo.ListSeparator))); } [Test] diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs index e8b68c56f4..bd11fbd30a 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs @@ -38,7 +38,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing{ [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class StringFormatTest { private void CheckDefaults (StringFormat sf) @@ -66,19 +65,17 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void Default_Dispose () { StringFormat sf = new StringFormat (); sf.Dispose (); - sf.ToString (); + Assert.Throws (() => sf.ToString ()); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void ctor_StringFormat_Null () { - new StringFormat (null); + Assert.Throws (() => new StringFormat (null)); } [Test] @@ -120,12 +117,11 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void GenericDefault_Local_Dispose () { StringFormat sf = StringFormat.GenericDefault; sf.Dispose (); // can't be cached - CheckDefaults (sf); + Assert.Throws (() => CheckDefaults (sf)); } private void CheckTypographic (StringFormat sf) @@ -155,12 +151,11 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (ArgumentException))] public void GenericTypographic_Local_Dispose () { StringFormat sf = StringFormat.GenericTypographic; sf.Dispose (); // can't be cached - CheckTypographic (sf); + Assert.Throws (() => CheckTypographic (sf)); } [Test] @@ -175,11 +170,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void Alignment_Invalid () { using (StringFormat sf = new StringFormat ()) { - sf.Alignment = (StringAlignment) Int32.MinValue; + Assert.Throws (() => sf.Alignment = (StringAlignment) Int32.MinValue); } } @@ -195,11 +189,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void HotkeyPrefix_Invalid () { using (StringFormat sf = new StringFormat ()) { - sf.HotkeyPrefix = (HotkeyPrefix) Int32.MinValue; + Assert.Throws (() => sf.HotkeyPrefix = (HotkeyPrefix) Int32.MinValue); } } @@ -215,11 +208,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void LineAlignment_Invalid () { using (StringFormat sf = new StringFormat ()) { - sf.LineAlignment = (StringAlignment) Int32.MinValue; + Assert.Throws (() => sf.LineAlignment = (StringAlignment) Int32.MinValue); } } @@ -235,11 +227,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void Trimming_Invalid () { using (StringFormat sf = new StringFormat ()) { - sf.Trimming = (StringTrimming) Int32.MinValue; + Assert.Throws (() => sf.Trimming = (StringTrimming) Int32.MinValue); } } @@ -311,11 +302,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (NullReferenceException))] public void SetTabStops_Null () { using (StringFormat sf = new StringFormat ()) { - sf.SetTabStops (Single.NaN, null); + Assert.Throws (() => sf.SetTabStops (Single.NaN, null)); } } @@ -330,11 +320,10 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (NullReferenceException))] public void SetMeasurableCharacterRanges_Null () { using (StringFormat sf = new StringFormat ()) { - sf.SetMeasurableCharacterRanges (null); + Assert.Throws (() => sf.SetMeasurableCharacterRanges (null)); } } @@ -357,12 +346,11 @@ namespace MonoTests.System.Drawing{ } [Test] - [ExpectedException (typeof (OverflowException))] public void SetMeasurableCharacterRanges_TooBig () { using (StringFormat sf = new StringFormat ()) { CharacterRange[] range = new CharacterRange[33]; - sf.SetMeasurableCharacterRanges (range); + Assert.Throws (() => sf.SetMeasurableCharacterRanges (range)); } } } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TextureBrushTest.cs b/mcs/class/System.Drawing/Test/System.Drawing/TextureBrushTest.cs index cc2dcd23ea..de3c24de7b 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TextureBrushTest.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TextureBrushTest.cs @@ -37,7 +37,6 @@ using NUnit.Framework; namespace MonoTests.System.Drawing { [TestFixture] - [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)] public class TextureBrushTest { private Image image; @@ -67,10 +66,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null () { - new TextureBrush (null); + Assert.Throws (() => new TextureBrush (null)); } [Test] @@ -81,10 +79,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null_WrapMode () { - new TextureBrush (null, WrapMode.Clamp); + Assert.Throws (() => new TextureBrush (null, WrapMode.Clamp)); } [Test] @@ -97,24 +94,21 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void CtorImageWrapMode_Invalid () { - new TextureBrush (image, (WrapMode) Int32.MinValue); + Assert.Throws (() => new TextureBrush (image, (WrapMode) Int32.MinValue)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null_Rectangle () { - new TextureBrush (null, rect); + Assert.Throws (() => new TextureBrush (null, rect)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CtorImageRectangle_Empty () { - new TextureBrush (image, new Rectangle ()); + Assert.Throws (() => new TextureBrush (image, new Rectangle ())); } [Test] @@ -125,17 +119,15 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null_RectangleF () { - new TextureBrush (null, rectf); + Assert.Throws (() => new TextureBrush (null, rectf)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CtorImageRectangleF_Empty () { - new TextureBrush (image, new RectangleF ()); + Assert.Throws (() => new TextureBrush (image, new RectangleF ())); } [Test] @@ -146,17 +138,15 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null_RectangleAttributes () { - new TextureBrush (null, rect, attr); + Assert.Throws (() => new TextureBrush (null, rect, attr)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CtorImageRectangle_Empty_Attributes () { - new TextureBrush (image, new Rectangle (), attr); + Assert.Throws (() => new TextureBrush (image, new Rectangle (), attr)); } [Test] @@ -174,17 +164,15 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void CtorImage_Null_RectangleFAttributes () { - new TextureBrush (null, rectf, attr); + Assert.Throws (() => new TextureBrush (null, rectf, attr)); } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void CtorImageRectangleF_Empty_Attributes () { - new TextureBrush (image, new RectangleF ()); + Assert.Throws (() => new TextureBrush (image, new RectangleF ())); } [Test] @@ -211,10 +199,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void CtorImageWrapMode_Invalid_Rectangle () { - new TextureBrush (image, (WrapMode) Int32.MinValue, rect); + Assert.Throws (() => new TextureBrush (image, (WrapMode) Int32.MinValue, rect)); } [Test] @@ -227,10 +214,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void CtorImageWrapMode_Invalid_RectangleF () { - new TextureBrush (image, (WrapMode) Int32.MinValue, rectf); + Assert.Throws (() => new TextureBrush (image, (WrapMode) Int32.MinValue, rectf)); } [Test] @@ -249,20 +235,18 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (OutOfMemoryException))] public void TextureBush_RectangleOutsideBitmap () { Rectangle r = new Rectangle (50, 50, 50, 50); Assert.IsFalse (r.Y + r.Height <= bmp.Height, "Height"); Assert.IsFalse (r.X + r.Width <= bmp.Width, "Width"); - new TextureBrush (bmp, r); + Assert.Throws (() => new TextureBrush (bmp, r)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void Transform_Null () { - new TextureBrush (image).Transform = null; + Assert.Throws (() => new TextureBrush (image).Transform = null); } [Test] @@ -285,10 +269,9 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (InvalidEnumArgumentException))] public void WrapMode_Invalid () { - new TextureBrush (image).WrapMode = (WrapMode)Int32.MinValue; + Assert.Throws (() => new TextureBrush (image).WrapMode = (WrapMode)Int32.MinValue); } [Test] @@ -300,12 +283,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void Dispose_Clone () { TextureBrush t = new TextureBrush (image); t.Dispose (); - t.Clone (); + Assert.Throws (() => t.Clone ()); } [Test] @@ -318,26 +300,23 @@ namespace MonoTests.System.Drawing { [Test] [NUnit.Framework.Category ("NotDotNet")] // AccessViolationException under 2.0 - [ExpectedException (typeof (ArgumentException))] public void Dispose_Image () { TextureBrush t = new TextureBrush (image); t.Dispose (); - Assert.IsNotNull (t.Image, "Image"); + Assert.Throws (() => Assert.IsNotNull (t.Image, "Image")); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform_Null () { - new TextureBrush (image).MultiplyTransform (null); + Assert.Throws (() => new TextureBrush (image).MultiplyTransform (null)); } [Test] - [ExpectedException (typeof (ArgumentNullException))] public void MultiplyTransform_Null_Order () { - new TextureBrush (image).MultiplyTransform (null, MatrixOrder.Append); + Assert.Throws (() => new TextureBrush (image).MultiplyTransform (null, MatrixOrder.Append)); } [Test] @@ -348,12 +327,11 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void MultiplyTransform_NonInvertible () { TextureBrush t = new TextureBrush (image); Matrix noninvertible = new Matrix (123, 24, 82, 16, 47, 30); - t.MultiplyTransform (noninvertible); + Assert.Throws (() => t.MultiplyTransform (noninvertible)); } [Test] @@ -384,11 +362,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void RotateTransform_InvalidOrder () { TextureBrush t = new TextureBrush (image); - t.RotateTransform (720, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => t.RotateTransform (720, (MatrixOrder) Int32.MinValue)); } [Test] @@ -423,11 +400,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void ScaleTransform_InvalidOrder () { TextureBrush t = new TextureBrush (image); - t.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => t.ScaleTransform (1, 1, (MatrixOrder) Int32.MinValue)); } [Test] @@ -454,11 +430,10 @@ namespace MonoTests.System.Drawing { } [Test] - [ExpectedException (typeof (ArgumentException))] public void TranslateTransform_InvalidOrder () { TextureBrush t = new TextureBrush (image); - t.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue); + Assert.Throws (() => t.TranslateTransform (1, 1, (MatrixOrder) Int32.MinValue)); } private void Alpha_81828 (WrapMode mode, bool equals) diff --git a/mcs/class/System.Drawing/orbis_System.Drawing.dll.sources b/mcs/class/System.Drawing/orbis_System.Drawing.dll.sources new file mode 100644 index 0000000000..0a0a514c1c --- /dev/null +++ b/mcs/class/System.Drawing/orbis_System.Drawing.dll.sources @@ -0,0 +1,3 @@ +Assembly/AssemblyInfo.cs +../../build/common/Consts.cs +#include netstandard.sources diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs index 3b3d96acc7..e4028a717f 100644 --- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs +++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs @@ -159,7 +159,7 @@ namespace System.EnterpriseServices { } [MonoTODO] - public static void SetNamedProperty (string name, object property) + public static void SetNamedProperty (string name, object value) { throw new NotImplementedException (); } diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs index 634104d140..450a1c7c42 100644 --- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs +++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs @@ -55,8 +55,8 @@ namespace System.EnterpriseServices { { } - public RegistrationException (string msg, Exception innerException) - : base (msg, innerException) + public RegistrationException (string msg, Exception inner) + : base (msg, inner) { } diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpacePolicyElement.cs b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpacePolicyElement.cs index a7c85802fa..59487fcc71 100644 --- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpacePolicyElement.cs +++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpacePolicyElement.cs @@ -36,15 +36,15 @@ namespace System.IdentityModel.Selectors public CardSpacePolicyElement ( XmlElement target, XmlElement issuer, Collection parameters, - Uri policyNoticeLink, - int policyNoticeVersion, + Uri privacyNoticeLink, + int privacyNoticeVersion, bool isManagedIssuer) { this.target = target; this.issuer = issuer; this.parameters = parameters ?? new Collection (); - this.policy_link = policyNoticeLink; - policy_ver = policyNoticeVersion; + this.policy_link = privacyNoticeLink; + policy_ver = privacyNoticeVersion; is_managed = isManagedIssuer; } diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpaceSelector.cs b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpaceSelector.cs index 16b6de3a66..4a37f4a1b0 100644 --- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpaceSelector.cs +++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors/CardSpaceSelector.cs @@ -62,19 +62,19 @@ namespace System.IdentityModel.Selectors [MonoTODO] public static GenericXmlSecurityToken GetToken ( CardSpacePolicyElement [] policyChain, - SecurityTokenSerializer serializer) + SecurityTokenSerializer tokenSerializer) { - return (GenericXmlSecurityToken) get_token.Invoke (impl, new object [] {policyChain, serializer}); + return (GenericXmlSecurityToken) get_token.Invoke (impl, new object [] {policyChain, tokenSerializer}); } public static GenericXmlSecurityToken GetToken ( XmlElement endpoint, IEnumerable policy, XmlElement requiredRemoteTokenIssuer, - SecurityTokenSerializer serializer) + SecurityTokenSerializer tokenSerializer) { CardSpacePolicyElement pe = new CardSpacePolicyElement (endpoint, requiredRemoteTokenIssuer, new Collection (new List (policy)), null, 0, requiredRemoteTokenIssuer != null); - return GetToken (new CardSpacePolicyElement [] {pe}, serializer); + return GetToken (new CardSpacePolicyElement [] {pe}, tokenSerializer); } [MonoTODO] diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs index 17df9c02d6..5a214aba0d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs @@ -78,7 +78,7 @@ namespace System.IdentityModel.Claims } [MonoTODO] - public static Claim CreateDenyOnlyWindowsSidClaim (SecurityIdentifier identifier) + public static Claim CreateDenyOnlyWindowsSidClaim (SecurityIdentifier sid) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs index 35f2b509c3..35bdf0a78f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs @@ -71,7 +71,7 @@ namespace System.IdentityModel.Claims } public abstract IEnumerable FindClaims ( - string resourceType, string right); + string claimType, string right); public abstract IEnumerator GetEnumerator (); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs index 539c7a6dca..b7370764ee 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs @@ -41,25 +41,25 @@ namespace System.IdentityModel.Claims // Constructors [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity) + public WindowsClaimSet (WindowsIdentity windowsIdentity) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, bool includeWindowsGroups) + public WindowsClaimSet (WindowsIdentity windowsIdentity, bool includeWindowsGroups) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, DateTime expirationTime) + public WindowsClaimSet (WindowsIdentity windowsIdentity, DateTime expirationTime) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, bool includeWindowsGroups, DateTime expirationTime) + public WindowsClaimSet (WindowsIdentity windowsIdentity, bool includeWindowsGroups, DateTime expirationTime) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs index b4479a72ff..5b7287bf9c 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs @@ -39,15 +39,15 @@ namespace System.IdentityModel.Policy { [MonoTODO] public static AuthorizationContext - CreateDefaultAuthorizationContext (IList policies) + CreateDefaultAuthorizationContext (IList authorizationPolicies) { - if (policies == null) - throw new ArgumentNullException ("policies"); + if (authorizationPolicies == null) + throw new ArgumentNullException ("authorizationPolicies"); string id = new UniqueId ().ToString (); DefaultEvaluationContext ctx = new DefaultEvaluationContext (); - foreach (IAuthorizationPolicy a in policies) { + foreach (IAuthorizationPolicy a in authorizationPolicies) { object o = null; a.Evaluate (ctx, ref o); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs index 9f4e82b7e7..7fde4e6659 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs @@ -46,10 +46,10 @@ namespace System.IdentityModel.Policy public abstract ReadOnlyCollection ClaimSets { get; } public abstract void AddClaimSet ( - IAuthorizationPolicy authorizationPolicy, + IAuthorizationPolicy policy, ClaimSet claimSet); - public abstract void RecordExpirationTime (DateTime time); + public abstract void RecordExpirationTime (DateTime expirationTime); } // default implementation diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs index 62d7d56782..644fda786c 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs @@ -46,11 +46,11 @@ namespace System.IdentityModel.Selectors } [MonoTODO] - public KerberosSecurityTokenProvider (string servicePrincipalName, TokenImpersonationLevel tokenImpersonationLevel, NetworkCredential credential) + public KerberosSecurityTokenProvider (string servicePrincipalName, TokenImpersonationLevel tokenImpersonationLevel, NetworkCredential networkCredential) { name = servicePrincipalName; impersonation_level = tokenImpersonationLevel; - this.credential = credential; + this.credential = networkCredential; } string name; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs index 7381e69150..b78eea054b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs @@ -41,11 +41,11 @@ namespace System.IdentityModel.Selectors public abstract SecurityTokenAuthenticator CreateSecurityTokenAuthenticator ( - SecurityTokenRequirement requirement, - out SecurityTokenResolver resolver); + SecurityTokenRequirement tokenRequirement, + out SecurityTokenResolver outOfBandTokenResolver); public abstract SecurityTokenProvider - CreateSecurityTokenProvider(SecurityTokenRequirement requirement); + CreateSecurityTokenProvider(SecurityTokenRequirement tokenRequirement); public abstract SecurityTokenSerializer CreateSecurityTokenSerializer (SecurityTokenVersion version); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs index 386e285bd7..9bc5a1ec5f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs @@ -77,16 +77,16 @@ namespace System.IdentityModel.Selectors EndCancelTokenCore (result); } - public SecurityToken RenewToken (TimeSpan timeout, SecurityToken token) + public SecurityToken RenewToken (TimeSpan timeout, SecurityToken tokenToBeRenewed) { - return RenewTokenCore (timeout, token); + return RenewTokenCore (timeout, tokenToBeRenewed); } public IAsyncResult BeginRenewToken ( - TimeSpan timeout, SecurityToken token, + TimeSpan timeout, SecurityToken tokenToBeRenewed, AsyncCallback callback, object state) { - return BeginRenewTokenCore (timeout, token, callback, state); + return BeginRenewTokenCore (timeout, tokenToBeRenewed, callback, state); } public SecurityToken EndRenewToken (IAsyncResult result) @@ -101,7 +101,7 @@ namespace System.IdentityModel.Selectors throw new NotSupportedException (String.Format ("Token cancellation on this security token provider '{0}' is not supported.", this)); } - protected virtual SecurityToken RenewTokenCore (TimeSpan timeout, SecurityToken token) + protected virtual SecurityToken RenewTokenCore (TimeSpan timeout, SecurityToken tokenToBeRenewed) { throw new NotSupportedException (String.Format ("Token renewal on this security token provider '{0}' is not supported.", this)); } @@ -124,7 +124,7 @@ namespace System.IdentityModel.Selectors protected virtual IAsyncResult BeginRenewTokenCore ( TimeSpan timeout, - SecurityToken token, + SecurityToken tokenToBeRenewed, AsyncCallback callback, object state) { throw new NotSupportedException (String.Format ("Token renewal on this security token provider '{0}' is not supported.", this)); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs index c75e373ab1..bff51cdf30 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs @@ -125,28 +125,28 @@ namespace System.IdentityModel.Selectors } } - public TValue GetProperty (string property) + public TValue GetProperty (string propertyName) { TValue ret; - if (TryGetProperty (property, out ret)) + if (TryGetProperty (propertyName, out ret)) return ret; - throw new ArgumentException (String.Format ("Property '{0}' was not found.", property)); + throw new ArgumentException (String.Format ("Property '{0}' was not found.", propertyName)); } - public bool TryGetProperty (string property, out TValue value) + public bool TryGetProperty (string propertyName, out TValue result) { object tmp; - value = default (TValue); + result = default (TValue); - if (!Properties.TryGetValue (property, out tmp)) + if (!Properties.TryGetValue (propertyName, out tmp)) return false; if (tmp == null && !typeof (TValue).IsValueType) - value = default (TValue); + result = default (TValue); else if (tmp is TValue) - value = (TValue) tmp; + result = (TValue) tmp; else - throw new ArgumentException (String.Format ("The value of property '{0}' is of type '{1}', while '{2}' is expected.", property, tmp.GetType (), typeof (TValue))); - return value != null; + throw new ArgumentException (String.Format ("The value of property '{0}' is of type '{1}', while '{2}' is expected.", propertyName, tmp.GetType (), typeof (TValue))); + return result != null; } } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs index e82c35c1f6..808479b45e 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs @@ -54,10 +54,10 @@ namespace System.IdentityModel.Tokens return (byte []) GetRawBuffer ().Clone (); } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { BinaryKeyIdentifierClause other = - clause as BinaryKeyIdentifierClause; + keyIdentifierClause as BinaryKeyIdentifierClause; if (other == null) return false; return Matches (other.GetRawBuffer ()); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs index d835a6acc8..6b7625c16a 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs @@ -1,4 +1,4 @@ -// +// // BootstrapContext.cs // // Author: @@ -60,14 +60,14 @@ namespace System.IdentityModel.Tokens { } /// Initializes a new instance of the class by using the specified security token and token handler. - public BootstrapContext (SecurityToken token, SecurityTokenHandler handler) + public BootstrapContext (SecurityToken token, SecurityTokenHandler tokenHandler) { if (token == null) throw new ArgumentNullException ("token"); - if (handler == null) - throw new ArgumentNullException ("handler"); + if (tokenHandler == null) + throw new ArgumentNullException ("tokenHandler"); SecurityToken = token; - SecurityTokenHandler = handler; + SecurityTokenHandler = tokenHandler; } /// Initializes a new instance of the class from a stream. diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs index 102a45afaf..ea9b1c079e 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs @@ -42,26 +42,26 @@ namespace System.IdentityModel.Tokens public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier) - : this (encryptedKey, encryptionMethod, identifier, null) + SecurityKeyIdentifier encryptingKeyIdentifier) + : this (encryptedKey, encryptionMethod, encryptingKeyIdentifier, null) { } public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier, string carriedKeyName) - : this (encryptedKey, encryptionMethod, identifier, carriedKeyName, null, 0) + SecurityKeyIdentifier encryptingKeyIdentifier, string carriedKeyName) + : this (encryptedKey, encryptionMethod, encryptingKeyIdentifier, carriedKeyName, null, 0) { } public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier, string carriedKeyName, + SecurityKeyIdentifier encryptingKeyIdentifier, string carriedKeyName, byte [] derivationNonce, int derivationLength) : base (encryptionMethod, encryptedKey, true, derivationNonce, derivationLength) { this.carried_key_name = carriedKeyName; - this.identifier = identifier; + this.identifier = encryptingKeyIdentifier; this.enc_method = encryptionMethod; } @@ -100,10 +100,10 @@ namespace System.IdentityModel.Tokens return true; } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { EncryptedKeyIdentifierClause e = - clause as EncryptedKeyIdentifierClause; + keyIdentifierClause as EncryptedKeyIdentifierClause; return e != null && Matches (e.GetRawBuffer (), e.EncryptionMethod, e.CarriedKeyName); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs index e503a35886..8b845d14b0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs @@ -111,7 +111,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs index b6a0f8c329..014d8a70f7 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs @@ -42,16 +42,16 @@ namespace System.IdentityModel.Tokens { byte [] key; - public InMemorySymmetricSecurityKey (byte [] key) - : this (key, true) + public InMemorySymmetricSecurityKey (byte [] symmetricKey) + : this (symmetricKey, true) { } - public InMemorySymmetricSecurityKey (byte [] key, bool clone) + public InMemorySymmetricSecurityKey (byte [] symmetricKey, bool cloneBuffer) { - if (key == null) - throw new ArgumentNullException ("key"); - this.key = clone ? (byte []) key.Clone() : key; + if (symmetricKey == null) + throw new ArgumentNullException ("symmetricKey"); + this.key = cloneBuffer ? (byte []) symmetricKey.Clone() : symmetricKey; } // SymmetricSecurityKey implementation diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs index 9d6badcb5f..610efd0d48 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs @@ -72,7 +72,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs index 3de266be9e..aabede60c0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs @@ -98,7 +98,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs index 82dbb01c4f..c58bc50c99 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs @@ -62,12 +62,12 @@ namespace System.IdentityModel.Tokens get { return owner_type; } } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { - if (clause == null) - throw new ArgumentNullException ("clause"); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); LocalIdKeyIdentifierClause c = - clause as LocalIdKeyIdentifierClause; + keyIdentifierClause as LocalIdKeyIdentifierClause; return c != null && Matches (c.LocalId, c.OwnerType); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs index a06b6a38fa..a448130eef 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs @@ -78,12 +78,12 @@ namespace System.IdentityModel.Tokens throw new NotImplementedException (); } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { - if (clause == null) - throw new ArgumentNullException ("clause"); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); RsaKeyIdentifierClause rkic = - clause as RsaKeyIdentifierClause; + keyIdentifierClause as RsaKeyIdentifierClause; return rkic != null && Matches (rkic.Rsa); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs index b1cc2bf2ee..2f5031ea72 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs @@ -46,7 +46,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override AsymmetricAlgorithm GetAsymmetricAlgorithm ( - string algorithm, bool privateKey) + string algorithm, bool requiresPrivateKey) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs index c44bc1dc99..b3fd1fafd0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs index 7deb104122..8f07e506e3 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -104,7 +104,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs index 306de28a90..b4b295a687 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs @@ -89,7 +89,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -105,7 +105,7 @@ namespace System.IdentityModel.Tokens switch (reader.LocalName) { case "Assertion": SamlAssertion a = new SamlAssertion (); - a.ReadXml (reader, samlSerializer, keyInfoTokenSerializer, outOfBandTokenResolver); + a.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); assertions.Add (a); break; case "AssertionIDReference": @@ -120,7 +120,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -130,7 +130,7 @@ namespace System.IdentityModel.Tokens foreach (string idref in AssertionIdReferences) writer.WriteElementString ("saml", "AssertionIDReference", SamlConstants.Namespace, idref); foreach (SamlAssertion assertion in Assertions) - assertion.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + assertion.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs index 65715ee56b..43d54cc3f6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs @@ -53,16 +53,16 @@ namespace System.IdentityModel.Tokens } public SamlAssertion (string assertionId, string issuer, - DateTime issueInstant, SamlConditions conditions, - SamlAdvice advice, IEnumerable statements) + DateTime issueInstant, SamlConditions samlConditions, + SamlAdvice samlAdvice, IEnumerable samlStatements) { if (IsInvalidAssertionId (assertionId)) throw new ArgumentException (String.Format ("The assertionId '{0}' must be a valid XML NCName.", assertionId)); if (issuer == null || issuer.Length == 0) throw new ArgumentException ("issuer"); - if (statements == null) - throw new ArgumentNullException ("statements"); + if (samlStatements == null) + throw new ArgumentNullException ("samlStatements"); major = 1; minor = 1; @@ -70,9 +70,9 @@ namespace System.IdentityModel.Tokens assertion_id = assertionId; this.issuer = issuer; issue_instant = issueInstant; - this.conditions = conditions; - this.advice = advice; - foreach (SamlStatement s in statements) { + this.conditions = samlConditions; + this.advice = samlAdvice; + foreach (SamlStatement s in samlStatements) { if (s == null) throw new ArgumentException ("statements contain null item."); this.statements.Add (s); @@ -180,7 +180,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -188,7 +188,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -211,11 +211,11 @@ namespace System.IdentityModel.Tokens try { if (Conditions != null) - Conditions.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + Conditions.WriteXml (writer, samlSerializer, keyInfoSerializer); if (Advice != null) - Advice.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + Advice.WriteXml (writer, samlSerializer, keyInfoSerializer); foreach (SamlStatement statement in Statements) - statement.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + statement.WriteXml (writer, samlSerializer, keyInfoSerializer); } catch (NotImplementedException) { throw; } catch (Exception ex) { // bad catch, eh? @@ -226,7 +226,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] protected void ReadSignature (XmlDictionaryReader reader, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver, SamlSerializer samlSerializer) { diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs index 61bf8b4de8..33d76628e4 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs @@ -49,7 +49,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs index 92605125f5..f1e5453832 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs @@ -114,7 +114,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -122,7 +122,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { writer.WriteStartElement ("saml", "Attribute", SamlConstants.Namespace); writer.WriteAttributeString ("AttributeName", Name); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs index abd6206926..0ef757e5d4 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs @@ -66,7 +66,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -74,14 +74,14 @@ namespace System.IdentityModel.Tokens public override void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (SamlSubject == null) throw new SecurityTokenException ("Subject is null in the AttributeStatement"); writer.WriteStartElement ("saml", "AttributeStatement", SamlConstants.Namespace); - SamlSubject.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + SamlSubject.WriteXml (writer, samlSerializer, keyInfoSerializer); foreach (SamlAttribute a in Attributes) - a.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + a.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs index 4dd369238f..13e07b66be 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs @@ -124,7 +124,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -132,7 +132,7 @@ namespace System.IdentityModel.Tokens public override void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -145,7 +145,7 @@ namespace System.IdentityModel.Tokens writer.WriteAttributeString ("AuthenticationMethod", AuthenticationMethod); writer.WriteAttributeString ("AuthenticationInstant", AuthenticationInstant.ToString (SamlConstants.DateFormat, CultureInfo.InvariantCulture)); - SamlSubject.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + SamlSubject.WriteXml (writer, samlSerializer, keyInfoSerializer); if (DnsAddress != null || IPAddress != null) { writer.WriteStartElement ("saml", "SubjectLocality", SamlConstants.Namespace); if (IPAddress != null) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs index 8949c160ee..e9d8d77507 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs @@ -46,11 +46,11 @@ namespace System.IdentityModel.Tokens { } - public SamlAuthorityBinding (XmlQualifiedName kind, string binding, string location) + public SamlAuthorityBinding (XmlQualifiedName authorityKind, string binding, string location) { - if (kind == null) - throw new ArgumentNullException ("kind"); - AuthorityKind = kind; + if (authorityKind == null) + throw new ArgumentNullException ("authorityKind"); + AuthorityKind = authorityKind; Binding = binding; Location = location; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs index 94d3813459..16dfcce1d6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs @@ -39,10 +39,10 @@ namespace System.IdentityModel.Tokens public class SamlAuthorizationDecisionClaimResource { public SamlAuthorizationDecisionClaimResource ( - string resource, SamlAccessDecision decision, string actionName, string actionNamespace) + string resource, SamlAccessDecision accessDecision, string actionNamespace, string actionName) { this.resource = resource; - this.decision = decision; + this.decision = accessDecision; this.name = actionName; this.ns = actionNamespace; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs index 816c2369fb..a3cd23bbb9 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs @@ -132,7 +132,7 @@ namespace System.IdentityModel.Tokens public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, SecurityTokenSerializer keyInfoSerializer, - SecurityTokenResolver resolver) + SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) throw new ArgumentNullException ("reader"); @@ -159,20 +159,20 @@ namespace System.IdentityModel.Tokens reader.MoveToContent (); SamlSubject = new SamlSubject (); - SamlSubject.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + SamlSubject.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); SamlActions.Clear (); for (reader.MoveToContent (); reader.LocalName == "Action" && reader.NamespaceURI == SamlConstants.Namespace; reader.MoveToContent ()) { SamlAction action = new SamlAction (); - action.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + action.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); SamlActions.Add (action); } if (reader.LocalName == "Evidence" && reader.NamespaceURI == SamlConstants.Namespace) { Evidence = new SamlEvidence (); - Evidence.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + Evidence.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); reader.MoveToContent (); } reader.ReadEndElement (); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs index e4e9568448..d72e789b31 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs @@ -102,7 +102,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -110,7 +110,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -123,7 +123,7 @@ namespace System.IdentityModel.Tokens if (has_not_on_after) writer.WriteAttributeString ("NotOnOrAfter", NotOnOrAfter.ToString (SamlConstants.DateFormat, invariant)); foreach (SamlCondition cond in Conditions) - cond.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + cond.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs index 6546902917..dd66972c50 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs @@ -100,7 +100,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, SecurityTokenSerializer keyInfoSerializer, - SecurityTokenResolver resolver) + SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) throw new ArgumentNullException ("reader"); @@ -118,7 +118,7 @@ namespace System.IdentityModel.Tokens switch (reader.LocalName) { case "Assertion": SamlAssertion a = new SamlAssertion (); - a.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + a.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); assertions.Add (a); break; case "AssertionIDReference": diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs index c2d1538d1d..7f58a9f2a6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs index 85c1ea1c61..03ff28b46a 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs @@ -43,56 +43,56 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual SamlAdvice LoadAdvice (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlAssertion LoadAssertion (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlAttribute LoadAttribute (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlCondition LoadCondition (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlConditions LoadConditions (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlStatement LoadStatement (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlSecurityToken ReadToken (XmlReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs index 4feb41544b..4917cf161f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs @@ -49,11 +49,11 @@ namespace System.IdentityModel.Tokens public abstract void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver); public abstract void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer); + SecurityTokenSerializer keyInfoSerializer); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs index 975f9727e1..c456500a11 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs @@ -153,7 +153,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -173,7 +173,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs index 302fe39cf0..bf35190026 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs @@ -42,9 +42,9 @@ namespace System.IdentityModel.Tokens this.list = new List (); } - public SecurityKeyIdentifier (params SecurityKeyIdentifierClause [] identifiers) + public SecurityKeyIdentifier (params SecurityKeyIdentifierClause [] clauses) { - this.list = new List (identifiers); + this.list = new List (clauses); } List list; @@ -67,15 +67,15 @@ namespace System.IdentityModel.Tokens get { return is_readonly; } } - public SecurityKeyIdentifierClause this [int i] { - get { return list [i]; } + public SecurityKeyIdentifierClause this [int index] { + get { return list [index]; } } - public void Add (SecurityKeyIdentifierClause item) + public void Add (SecurityKeyIdentifierClause clause) { if (is_readonly) throw new InvalidOperationException ("This SecurityKeyIdentifier is read-only."); - list.Add (item); + list.Add (clause); } public SecurityKey CreateKey () @@ -121,13 +121,13 @@ namespace System.IdentityModel.Tokens return sb.ToString (); } - public bool TryFind (out TClause result) + public bool TryFind (out TClause clause) where TClause : SecurityKeyIdentifierClause { - result = default (TClause); + clause = default (TClause); foreach (SecurityKeyIdentifierClause kic in this) if (typeof (TClause).IsAssignableFrom (kic.GetType ())) { - result = (TClause) kic; + clause = (TClause) kic; return true; } return false; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs index 1dba495463..d464e524bc 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs @@ -39,12 +39,12 @@ namespace System.IdentityModel.Tokens this.clause_type = clauseType; } - protected SecurityKeyIdentifierClause (string clauseType, byte [] derivationNonce, int derivationLength) + protected SecurityKeyIdentifierClause (string clauseType, byte [] nonce, int length) { this.clause_type = clauseType; - if (derivationNonce != null) - this.nonce = (byte []) derivationNonce.Clone (); - this.deriv_length = derivationLength; + if (nonce != null) + this.nonce = (byte []) nonce.Clone (); + this.deriv_length = length; } string clause_type; @@ -76,7 +76,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public virtual bool Matches (SecurityKeyIdentifierClause clause) + public virtual bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs index 23a636626f..335808fc56 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs @@ -63,24 +63,24 @@ namespace System.IdentityModel.Tokens } public virtual bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { return false; } [MonoTODO] public virtual SecurityKey ResolveKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { - if (skiClause == null) - throw new ArgumentNullException ("skiClause"); - if (!MatchesKeyIdentifierClause (skiClause)) - throw new InvalidOperationException (String.Format ("This '{0}' security token does not support resolving '{1}' key identifier clause.", GetType (), skiClause)); - if (skiClause.CanCreateKey) - return skiClause.CreateKey (); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); + if (!MatchesKeyIdentifierClause (keyIdentifierClause)) + throw new InvalidOperationException (String.Format ("This '{0}' security token does not support resolving '{1}' key identifier clause.", GetType (), keyIdentifierClause)); + if (keyIdentifierClause.CanCreateKey) + return keyIdentifierClause.CreateKey (); // FIXME: examine it. if (SecurityKeys.Count == 0) - throw new InvalidOperationException (String.Format ("This '{0}' security token does not have any keys that can be resolved.", GetType (), skiClause)); + throw new InvalidOperationException (String.Format ("This '{0}' security token does not have any keys that can be resolved.", GetType (), keyIdentifierClause)); return SecurityKeys [0]; } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs index bdd6eb50e0..9ce9eb87b3 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class SecurityTokenException : SystemException { public SecurityTokenException () : base () {} - public SecurityTokenException (string msg) : base (msg) {} - public SecurityTokenException (string msg, Exception inner) : base (msg, inner) {} + public SecurityTokenException (string message) : base (message) {} + public SecurityTokenException (string message, Exception innerException) : base (message, innerException) {} protected SecurityTokenException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs index c5301cd6f8..9aaf39d51a 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenExpiredException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenExpiredException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenExpiredException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenExpiredException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs index 4f9e5f18f6..4f4b76d676 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenNotYetValidException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenNotYetValidException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenNotYetValidException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenNotYetValidException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs index e04d0cbd28..b0113defd8 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenReplayDetectedException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenReplayDetectedException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenReplayDetectedException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenReplayDetectedException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs index 72189b8b97..e9c5bc879b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class SecurityTokenValidationException : SecurityTokenException { public SecurityTokenValidationException () : base () {} - public SecurityTokenValidationException (string msg) : base (msg) {} - public SecurityTokenValidationException (string msg, Exception inner) : base (msg, inner) {} + public SecurityTokenValidationException (string message) : base (message) {} + public SecurityTokenValidationException (string message, Exception innerException) : base (message, innerException) {} protected SecurityTokenValidationException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs index 66c68c0030..1a37602138 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs @@ -42,14 +42,14 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public WindowsSecurityToken (WindowsIdentity identity) + public WindowsSecurityToken (WindowsIdentity windowsIdentity) { throw new NotImplementedException (); } - public WindowsSecurityToken (WindowsIdentity identity, string id) + public WindowsSecurityToken (WindowsIdentity windowsIdentity, string id) { - this.identity = identity; + this.identity = windowsIdentity; this.id = id; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs index f95ec9bb5d..3dc838424d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs @@ -99,10 +99,10 @@ namespace System.IdentityModel.Tokens get { return serial; } } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { X509IssuerSerialKeyIdentifierClause other = - clause as X509IssuerSerialKeyIdentifierClause; + keyIdentifierClause as X509IssuerSerialKeyIdentifierClause; return other != null && Matches (other.name, other.serial); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs index fe3751b96a..ea545764c0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs @@ -111,27 +111,27 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { LocalIdKeyIdentifierClause l = - skiClause as LocalIdKeyIdentifierClause; + keyIdentifierClause as LocalIdKeyIdentifierClause; if (l != null) return l.LocalId == Id; X509ThumbprintKeyIdentifierClause t = - skiClause as X509ThumbprintKeyIdentifierClause; + keyIdentifierClause as X509ThumbprintKeyIdentifierClause; if (t != null) return t.Matches (cert); X509IssuerSerialKeyIdentifierClause i = - skiClause as X509IssuerSerialKeyIdentifierClause; + keyIdentifierClause as X509IssuerSerialKeyIdentifierClause; if (i != null) return i.Matches (cert); X509SubjectKeyIdentifierClause s = - skiClause as X509SubjectKeyIdentifierClause; + keyIdentifierClause as X509SubjectKeyIdentifierClause; if (s != null) return s.Matches (cert); X509RawDataKeyIdentifierClause r = - skiClause as X509RawDataKeyIdentifierClause; + keyIdentifierClause as X509RawDataKeyIdentifierClause; if (r != null) return r.Matches (cert); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs index 9780e8b9e1..b1f7adffe6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class X509SubjectKeyIdentifierClause : BinaryKeyIdentifierClause { [MonoTODO] - public X509SubjectKeyIdentifierClause (byte [] certificateSubject) - : base (null, certificateSubject, true) + public X509SubjectKeyIdentifierClause (byte [] ski) + : base (null, ski, true) { throw new NotImplementedException (); } @@ -66,7 +66,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public static bool TryCreateFrom (X509Certificate2 certificate, out X509SubjectKeyIdentifierClause clause) + public static bool TryCreateFrom (X509Certificate2 certificate, out X509SubjectKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs index 4b8cdda2ed..0ae177e7d7 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs @@ -34,8 +34,8 @@ namespace System.IdentityModel.Tokens { public class X509ThumbprintKeyIdentifierClause : BinaryKeyIdentifierClause { - public X509ThumbprintKeyIdentifierClause (byte [] certificateThumbprint) - : base (null, certificateThumbprint, true) + public X509ThumbprintKeyIdentifierClause (byte [] thumbprint) + : base (null, thumbprint, true) { } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs index c2c77269bc..fe0c7b52d5 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs @@ -37,16 +37,16 @@ namespace System.IdentityModel.Tokens public class X509WindowsSecurityToken : X509SecurityToken { [MonoTODO] - public X509WindowsSecurityToken (X509Certificate2 cert, WindowsIdentity identity) - : base (cert) + public X509WindowsSecurityToken (X509Certificate2 certificate, WindowsIdentity windowsIdentity) + : base (certificate) { throw new NotImplementedException (); } - public X509WindowsSecurityToken (X509Certificate2 cert, WindowsIdentity identity, string id) - : base (cert, id) + public X509WindowsSecurityToken (X509Certificate2 certificate, WindowsIdentity windowsIdentity, string id) + : base (certificate, id) { - this.identity = identity; + this.identity = windowsIdentity; } WindowsIdentity identity; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs b/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs index 0a1f0ceb48..6ce46ff3af 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs @@ -1,4 +1,4 @@ -// +// // SignatureVerificationFailedException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel : base(message) { } - public SignatureVerificationFailedException(string message, Exception innerException) - : base(message, innerException) + public SignatureVerificationFailedException(string message, Exception inner) + : base(message, inner) { } public SignatureVerificationFailedException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.Management/System.Management/MethodDataCollection.cs b/mcs/class/System.Management/System.Management/MethodDataCollection.cs index 24691a7ce8..dcf57c57c8 100644 --- a/mcs/class/System.Management/System.Management/MethodDataCollection.cs +++ b/mcs/class/System.Management/System.Management/MethodDataCollection.cs @@ -68,7 +68,7 @@ namespace System.Management throw new NotImplementedException (); } - public virtual void Add (string methodName, ManagementBaseObject inParams, ManagementBaseObject outParams) + public virtual void Add (string methodName, ManagementBaseObject inParameters, ManagementBaseObject outParameters) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs index a3335ea550..4aeaf50cd9 100644 --- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs +++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs @@ -292,8 +292,9 @@ namespace System.Net.Http } if (header.Key == "Transfer-Encoding") { - // Chunked Transfer-Encoding is never set for HttpWebRequest. It's detected - // from ContentLength by HttpWebRequest + // + // Chunked Transfer-Encoding is set for HttpWebRequest later when Content length is checked + // values = values.Where (l => l != "chunked"); } @@ -354,15 +355,22 @@ namespace System.Net.Http } } - // - // Content length has to be set because HttpWebRequest is running without buffering - // - var contentLength = content.Headers.ContentLength; - if (contentLength != null) { - wrequest.ContentLength = contentLength.Value; + if (request.Headers.TransferEncodingChunked == true) { + wrequest.SendChunked = true; } else { - await content.LoadIntoBufferAsync (MaxRequestContentBufferSize).ConfigureAwait (false); - wrequest.ContentLength = content.Headers.ContentLength.Value; + // + // Content length has to be set because HttpWebRequest is running without buffering + // + var contentLength = content.Headers.ContentLength; + if (contentLength != null) { + wrequest.ContentLength = contentLength.Value; + } else { + if (MaxRequestContentBufferSize == 0) + throw new InvalidOperationException ("The content length of the request content can't be determined. Either set TransferEncodingChunked to true, load content into buffer, or set MaxRequestContentBufferSize."); + + await content.LoadIntoBufferAsync (MaxRequestContentBufferSize).ConfigureAwait (false); + wrequest.ContentLength = content.Headers.ContentLength.Value; + } } wrequest.ResendContentFactory = content.CopyTo; @@ -394,7 +402,6 @@ namespace System.Net.Http return CreateResponseMessage (wresponse, request, cancellationToken); } -#if NETSTANDARD public bool CheckCertificateRevocationList { get { throw new NotImplementedException (); @@ -460,7 +467,5 @@ namespace System.Net.Http throw new NotImplementedException (); } } - -#endif } } diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs index eb5b7ffa82..f796a202d5 100644 --- a/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs +++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.platformnotsupported.cs @@ -131,7 +131,6 @@ namespace System.Net.Http throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } -#if NETSTANDARD public bool CheckCertificateRevocationList { get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } @@ -170,6 +169,5 @@ namespace System.Net.Http get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } } -#endif } } diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs index d9aab417df..72508c4883 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs @@ -1093,6 +1093,110 @@ namespace MonoTests.System.Net.Http } } + [Test] +#if FEATURE_NO_BSD_SOCKETS + [ExpectedException (typeof (PlatformNotSupportedException))] +#endif + public void Post_TransferEncodingChunked () + { + bool? failed = null; + var listener = CreateListener (l => { + try { + var request = l.Request; + + Assert.IsNull (request.AcceptTypes, "#1"); + Assert.AreEqual (-1, request.ContentLength64, "#2"); + Assert.IsNull (request.ContentType, "#3"); + Assert.AreEqual (0, request.Cookies.Count, "#4"); + Assert.IsTrue (request.HasEntityBody, "#5"); + Assert.AreEqual (TestHost, request.Headers ["Host"], "#6b"); + Assert.AreEqual ("POST", request.HttpMethod, "#7"); + Assert.IsFalse (request.IsAuthenticated, "#8"); + Assert.IsTrue (request.IsLocal, "#9"); + Assert.IsFalse (request.IsSecureConnection, "#10"); + Assert.IsFalse (request.IsWebSocketRequest, "#11"); + Assert.IsTrue (request.KeepAlive, "#12"); + Assert.AreEqual (HttpVersion.Version11, request.ProtocolVersion, "#13"); + Assert.IsNull (request.ServiceName, "#14"); + Assert.IsNull (request.UrlReferrer, "#15"); + Assert.IsNull (request.UserAgent, "#16"); + Assert.IsNull (request.UserLanguages, "#17"); + Assert.AreEqual ("chunked", request.Headers ["Transfer-Encoding"], "#18"); + Assert.IsNull (request.Headers ["Content-Length"], "#19"); + failed = false; + } catch (Exception e) { + failed = true; + Console.WriteLine (e); + } + }); + + try { + var client = new HttpClient (); + + client.DefaultRequestHeaders.TransferEncodingChunked = true; + + var imageContent = new StreamContent (new MemoryStream ()); + + var response = client.PostAsync (LocalServer, imageContent).Result; + + Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, "#101"); + Assert.AreEqual(false, failed, "#102"); + } finally { + listener.Close (); + } + } + + [Test] +#if FEATURE_NO_BSD_SOCKETS + [ExpectedException (typeof (PlatformNotSupportedException))] +#endif + public void Post_StreamCaching () + { + bool? failed = null; + var listener = CreateListener (l => { + try { + var request = l.Request; + + Assert.IsNull (request.AcceptTypes, "#1"); + Assert.AreEqual (0, request.ContentLength64, "#2"); + Assert.IsNull (request.ContentType, "#3"); + Assert.AreEqual (0, request.Cookies.Count, "#4"); + Assert.IsFalse (request.HasEntityBody, "#5"); + Assert.AreEqual (TestHost, request.Headers ["Host"], "#6b"); + Assert.AreEqual ("POST", request.HttpMethod, "#7"); + Assert.IsFalse (request.IsAuthenticated, "#8"); + Assert.IsTrue (request.IsLocal, "#9"); + Assert.IsFalse (request.IsSecureConnection, "#10"); + Assert.IsFalse (request.IsWebSocketRequest, "#11"); + Assert.IsTrue (request.KeepAlive, "#12"); + Assert.AreEqual (HttpVersion.Version11, request.ProtocolVersion, "#13"); + Assert.IsNull (request.ServiceName, "#14"); + Assert.IsNull (request.UrlReferrer, "#15"); + Assert.IsNull (request.UserAgent, "#16"); + Assert.IsNull (request.UserLanguages, "#17"); + Assert.IsNull (request.Headers ["Transfer-Encoding"], "#18"); + Assert.AreEqual ("0", request.Headers ["Content-Length"], "#19"); + failed = false; + } catch (Exception e) { + failed = true; + Console.WriteLine (e); + } + }); + + try { + var client = new HttpClient (); + + var imageContent = new StreamContent (new MemoryStream ()); + + var response = client.PostAsync (LocalServer, imageContent).Result; + + Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, "#101"); + Assert.AreEqual(false, failed, "#102"); + } finally { + listener.Close (); + } + } + [Test] [Category ("MobileNotWorking")] // Missing encoding #if FEATURE_NO_BSD_SOCKETS diff --git a/mcs/class/System.Numerics.Vectors/SR.cs b/mcs/class/System.Numerics.Vectors/SR.cs deleted file mode 100644 index 6c04e222d6..0000000000 --- a/mcs/class/System.Numerics.Vectors/SR.cs +++ /dev/null @@ -1,14 +0,0 @@ -// -// This file was generated by resx2sr tool -// - -partial class SR -{ - public const string Arg_ArgumentOutOfRangeException = "Index was out of bounds:"; - public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array"; - public const string Arg_MultiDimArrayNotSupported = "Only one-dimensional arrays are supported"; - public const string Arg_NullArgumentNullRef = "The method was called with a null array argument."; - public const string Arg_RegisterLengthOfRangeException = "length must be less than"; - public const string Arg_TypeNotSupported = "Specified type is not supported"; - public const string Reflection_MethodNotSupported = "Vector.Count cannot be called via reflection when intrinsics are enabled."; -} diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources index a5f261e85c..74524d655f 100644 --- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources +++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources @@ -2,11 +2,11 @@ ../../build/common/SR.cs Assembly/AssemblyInfo.cs Assembly/TypeForwarders.cs -SR.cs +corefx/SR.cs ../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs ../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/ConstantHelper.cs -../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics//JitIntrinsicAttribute.cs -../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics//Register.cs -../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics//Vector_Operations.cs -../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics//Vector.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Register.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector_Operations.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector.cs diff --git a/mcs/class/System.Numerics.Vectors/corefx/SR.cs b/mcs/class/System.Numerics.Vectors/corefx/SR.cs new file mode 100644 index 0000000000..def5b0907e --- /dev/null +++ b/mcs/class/System.Numerics.Vectors/corefx/SR.cs @@ -0,0 +1,11 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string Arg_ArgumentOutOfRangeException = "Index was out of bounds:"; + public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array"; + public const string Arg_NullArgumentNullRef = "The method was called with a null array argument."; + public const string Arg_TypeNotSupported = "Specified type is not supported"; +} diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile index bc470e1b6e..f13e64122a 100644 --- a/mcs/class/System.Numerics/Makefile +++ b/mcs/class/System.Numerics/Makefile @@ -4,10 +4,14 @@ include ../../build/rules.make LIBRARY = System.Numerics.dll LIB_REFS = System -LIB_MCS_FLAGS = /unsafe -nowarn:414 -nowarn:436 +LIB_MCS_FLAGS = /unsafe TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +XTEST_LIB_REFS = System Facades/System.Threading.Tasks System.Runtime.InteropServices.RuntimeInformation System.Core System.Numerics.Vectors Microsoft.CSharp +XTEST_LIB_FLAGS = -unsafe -TXT_RESOURCE_STRINGS = ../referencesource/System.Numerics/System.Numerics.txt +RESX_RESOURCE_STRING = \ + ../../../external/corefx/src/System.Runtime.Numerics/src/Resources/Strings.resx \ + ../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx EXTRA_DISTFILES = diff --git a/mcs/class/System.Numerics/ReferenceSources/SR.cs b/mcs/class/System.Numerics/ReferenceSources/SR.cs deleted file mode 100644 index 3b4d7bd23e..0000000000 --- a/mcs/class/System.Numerics/ReferenceSources/SR.cs +++ /dev/null @@ -1,21 +0,0 @@ -// -// This file was generated by txt2sr tool -// - -partial class SR -{ - public const string Argument_InvalidNumberStyles = "An undefined NumberStyles value is being used."; - public const string Argument_InvalidHexStyle = "With the AllowHexSpecifier bit set in the enum bit field, the only other valid bits that can be combined into the enum value must be a subset of those in HexNumber."; - public const string Argument_MustBeBigInt = "The parameter must be a BigInteger."; - public const string Format_InvalidFormatSpecifier = "Format specifier was invalid."; - public const string Format_TooLarge = "The value is too large to be represented by this format specifier."; - public const string ArgumentOutOfRange_MustBeNonNeg = "The number must be greater than or equal to zero."; - public const string Overflow_BigIntInfinity = "BigInteger cannot represent infinity."; - public const string Overflow_NotANumber = "The value is not a number."; - public const string Overflow_ParseBigInteger = "The value could not be parsed."; - public const string Overflow_Int32 = "Value was either too large or too small for an Int32."; - public const string Overflow_Int64 = "Value was either too large or too small for an Int64."; - public const string Overflow_UInt32 = "Value was either too large or too small for a UInt32."; - public const string Overflow_UInt64 = "Value was either too large or too small for a UInt64."; - public const string Overflow_Decimal = "Value was either too large or too small for a Decimal."; -} diff --git a/mcs/class/System.Numerics/System.Numerics.dll.sources b/mcs/class/System.Numerics/System.Numerics.dll.sources index 9d03ee1391..4a50c42d7f 100644 --- a/mcs/class/System.Numerics/System.Numerics.dll.sources +++ b/mcs/class/System.Numerics/System.Numerics.dll.sources @@ -1,21 +1,36 @@ +../../build/common/Consts.cs ../../build/common/SR.cs Assembly/AssemblyInfo.cs -ReferenceSources/SR.cs -../referencesource/System.Numerics/System/Numerics/BigInteger.cs -../referencesource/System.Numerics/System/Numerics/BigIntegerBuilder.cs -../referencesource/System.Numerics/System/Numerics/BigNumber.cs -../referencesource/System.Numerics/System/Numerics/Complex.cs -../referencesource/System.Numerics/System/Numerics/NumericsHelpers.cs -../referencesource/System.Numerics/System/Numerics/HashCodeHelper.cs -../referencesource/System.Numerics/System/Numerics/JITIntrinsicAttribute.cs -../referencesource/System.Numerics/System/Numerics/Matrix3x2.cs -../referencesource/System.Numerics/System/Numerics/Matrix4x4.cs -../referencesource/System.Numerics/System/Numerics/Plane.cs -../referencesource/System.Numerics/System/Numerics/Quaternion.cs -../referencesource/System.Numerics/System/Numerics/Vector2.cs -../referencesource/System.Numerics/System/Numerics/Vector2_Intrinsics.cs -../referencesource/System.Numerics/System/Numerics/Vector3.cs -../referencesource/System.Numerics/System/Numerics/Vector3_Intrinsics.cs -../referencesource/System.Numerics/System/Numerics/Vector4.cs -../referencesource/System.Numerics/System/Numerics/Vector4_Intrinsics.cs -../referencesource/System.Numerics/System/Numerics/Vector_Operations.cs +corefx/SR.cs +corefx/Vector.cs + +../../../external/corefx/src/Common/src/System/Globalization/FormatProvider.Number.cs +../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs + +../../../external/corefx/src/System.Runtime.Numerics/src/System/Globalization/FormatProvider.BigInteger.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Globalization/FormatProvider.NumberBuffer.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.AddSub.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.BitsBuffer.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.DivRem.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.FastReducer.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.GcdInv.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.PowMod.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.SquMul.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/BigNumber.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs +../../../external/corefx/src/System.Runtime.Numerics/src/System/Numerics/NumericsHelpers.cs + +../../../external/corefx/src/System.Numerics.Vectors/src/System/MathF.cs + +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/JitIntrinsicAttribute.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Matrix3x2.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Matrix4x4.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Plane.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Quaternion.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector2_Intrinsics.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector3_Intrinsics.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4.cs +../../../external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Vector4_Intrinsics.cs diff --git a/mcs/class/System.Numerics/corefx/SR.cs b/mcs/class/System.Numerics/corefx/SR.cs new file mode 100644 index 0000000000..e4590b7131 --- /dev/null +++ b/mcs/class/System.Numerics/corefx/SR.cs @@ -0,0 +1,25 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string Argument_BadFormatSpecifier = "Format specifier was invalid."; + public const string Argument_InvalidNumberStyles = "An undefined NumberStyles value is being used."; + public const string Argument_InvalidHexStyle = "With the AllowHexSpecifier bit set in the enum bit field, the only other valid bits that can be combined into the enum value must be a subset of those in HexNumber."; + public const string Argument_MustBeBigInt = "The parameter must be a BigInteger."; + public const string Format_TooLarge = "The value is too large to be represented by this format specifier."; + public const string ArgumentOutOfRange_MustBeNonNeg = "The number must be greater than or equal to zero."; + public const string Overflow_BigIntInfinity = "BigInteger cannot represent infinity."; + public const string Overflow_NotANumber = "The value is not a number."; + public const string Overflow_ParseBigInteger = "The value could not be parsed."; + public const string Overflow_Int32 = "Value was either too large or too small for an Int32."; + public const string Overflow_Int64 = "Value was either too large or too small for an Int64."; + public const string Overflow_UInt32 = "Value was either too large or too small for a UInt32."; + public const string Overflow_UInt64 = "Value was either too large or too small for a UInt64."; + public const string Overflow_Decimal = "Value was either too large or too small for a Decimal."; + public const string Arg_ArgumentOutOfRangeException = "Index was out of bounds:"; + public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array"; + public const string Arg_NullArgumentNullRef = "The method was called with a null array argument."; + public const string Arg_TypeNotSupported = "Specified type is not supported"; +} diff --git a/mcs/class/System.Numerics/corefx/Vector.cs b/mcs/class/System.Numerics/corefx/Vector.cs new file mode 100644 index 0000000000..de085baeb1 --- /dev/null +++ b/mcs/class/System.Numerics/corefx/Vector.cs @@ -0,0 +1,12 @@ +namespace System.Numerics +{ + static class Vector + { + [JitIntrinsic] + public static bool IsHardwareAccelerated { + get { + return false; + } + } + } +} \ No newline at end of file diff --git a/mcs/class/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs b/mcs/class/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs deleted file mode 100644 index 993d77ceb1..0000000000 --- a/mcs/class/System.Reflection.DispatchProxy/Assembly/AssemblyInfo.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -// AssemblyInfo.cs -// -// Author: -// Alexander Köplinger (alexander.koeplinger@xamarin.com) -// -// (C) 2016 Xamarin, Inc. -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Reflection; -using System.Resources; -using System.Security; -using System.Security.Permissions; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about the assembly - -[assembly: AssemblyTitle ("System.Reflection.DispatchProxy.dll")] -[assembly: AssemblyDescription ("System.Reflection.DispatchProxy.dll")] -[assembly: AssemblyDefaultAlias ("System.Reflection.DispatchProxy.dll")] - -[assembly: AssemblyCompany (Consts.MonoCompany)] -[assembly: AssemblyProduct (Consts.MonoProduct)] -[assembly: AssemblyCopyright (Consts.MonoCopyright)] -[assembly: AssemblyVersion (Consts.FxVersion)] -[assembly: SatelliteContractVersion (Consts.FxVersion)] -[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)] -[assembly: AssemblyFileVersion (Consts.FxFileVersion)] - -[assembly: NeutralResourcesLanguage ("en-US")] -[assembly: CLSCompliant (true)] -[assembly: AssemblyDelaySign (true)] - -[assembly: AssemblyKeyFile("../msfinal.pub")] - -[assembly: SecurityCritical] - -[assembly: ComVisible (false)] \ No newline at end of file diff --git a/mcs/class/System.Reflection.DispatchProxy/Makefile b/mcs/class/System.Reflection.DispatchProxy/Makefile deleted file mode 100644 index ddc839647f..0000000000 --- a/mcs/class/System.Reflection.DispatchProxy/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -thisdir = class/System.Reflection.DispatchProxy -SUBDIRS = -include ../../build/rules.make - -LIBRARY = System.Reflection.DispatchProxy.dll -LIB_REFS = System -LIB_MCS_FLAGS = - -NO_TEST = yes - -include ../../build/library.make diff --git a/mcs/class/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources b/mcs/class/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources deleted file mode 100644 index da5d484aa9..0000000000 --- a/mcs/class/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.dll.sources +++ /dev/null @@ -1,5 +0,0 @@ -../../build/common/Consts.cs -../../build/common/Locale.cs -../../build/common/MonoTODOAttribute.cs -Assembly/AssemblyInfo.cs -System.Reflection/DispatchProxy.cs diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs index 1a7d41de48..2fdeb99696 100644 --- a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs +++ b/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs @@ -1,5 +1,5 @@ // This is a copy of external/referencesource/System.Runtime.Caching/Resources/R.Designer.cs -// This verison does not use ResourceManager, instead it uses hard coded strings. +// This version does not use ResourceManager, instead it uses hard coded strings. // This should be removed once Mono has access to .NET resources. namespace System.Runtime.Caching.Resources { diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs deleted file mode 100644 index 1a408f2711..0000000000 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -// AssemblyInfo.cs -// -// Author: -// Alexander Köplinger (alexander.koeplinger@xamarin.com) -// -// (C) 2016 Xamarin, Inc. -// - -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Reflection; -using System.Resources; -using System.Security; -using System.Security.Permissions; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about the assembly - -[assembly: AssemblyTitle ("System.Runtime.InteropServices.RuntimeInformation.dll")] -[assembly: AssemblyDescription ("System.Runtime.InteropServices.RuntimeInformation.dll")] -[assembly: AssemblyDefaultAlias ("System.Runtime.InteropServices.RuntimeInformation.dll")] - -[assembly: AssemblyCompany (Consts.MonoCompany)] -[assembly: AssemblyProduct (Consts.MonoProduct)] -[assembly: AssemblyCopyright (Consts.MonoCopyright)] -[assembly: AssemblyVersion ("4.0.0.0")] -[assembly: SatelliteContractVersion (Consts.FxVersion)] -[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)] -[assembly: AssemblyFileVersion (Consts.FxFileVersion)] - -[assembly: NeutralResourcesLanguage ("en-US")] -[assembly: CLSCompliant (true)] -[assembly: AssemblyDelaySign (true)] - -[assembly: AssemblyKeyFile("../msfinal.pub")] - -[assembly: SecurityCritical] - -[assembly: ComVisible (false)] \ No newline at end of file diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Makefile b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Makefile deleted file mode 100644 index 74151102e9..0000000000 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -thisdir = class/System.Runtime.InteropServices.RuntimeInformation -SUBDIRS = -include ../../build/rules.make - -LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll -LIB_REFS = System -LIB_MCS_FLAGS = - -NO_TEST = yes - -include ../../build/library.make diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/SR.cs b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/SR.cs deleted file mode 100644 index 25589051b2..0000000000 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/SR.cs +++ /dev/null @@ -1,9 +0,0 @@ -// This *will be* auto-generated file - -namespace System.Runtime.InteropServices -{ - static class SR - { - public const string Argument_EmptyValue = "Value cannot be empty."; - } -} \ No newline at end of file diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources deleted file mode 100644 index 5855f23300..0000000000 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources +++ /dev/null @@ -1,7 +0,0 @@ -../../build/common/Consts.cs -Assembly/AssemblyInfo.cs -System.Runtime.InteropServices/RuntimeInformation.cs -SR.cs - -../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs -../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/Architecture.cs diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile index 145f30f4b6..8602d8ff40 100644 --- a/mcs/class/System.Security/Makefile +++ b/mcs/class/System.Security/Makefile @@ -25,6 +25,8 @@ EXTRA_DISTFILES = \ Test/System.Security.Cryptography.Pkcs/detached.data \ Test/System.Security.Cryptography.Pkcs/detached.p7 +RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Security.Cryptography.Xml/src/Resources/Strings.resx + include ../../build/library.make $(build_lib): $(secxml_libdir)/System.dll $(MONO_SECURITY_DLL) diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs index 52ddd84da3..0dbbbdabad 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs @@ -55,18 +55,18 @@ namespace System.Security.Cryptography.Pkcs { _info = new SignerInfoCollection (); } - public SignedCms (ContentInfo content) - : this (content, false) + public SignedCms (ContentInfo contentInfo) + : this (contentInfo, false) { } - public SignedCms (ContentInfo content, bool detached) + public SignedCms (ContentInfo contentInfo, bool detached) : this () { - if (content == null) - throw new ArgumentNullException ("content"); + if (contentInfo == null) + throw new ArgumentNullException ("contentInfo"); - _content = content; + _content = contentInfo; _detached = detached; } @@ -75,14 +75,14 @@ namespace System.Security.Cryptography.Pkcs { _type = signerIdentifierType; } - public SignedCms (SubjectIdentifierType signerIdentifierType, ContentInfo content) - : this (content, false) + public SignedCms (SubjectIdentifierType signerIdentifierType, ContentInfo contentInfo) + : this (contentInfo, false) { _type = signerIdentifierType; } - public SignedCms (SubjectIdentifierType signerIdentifierType, ContentInfo content, bool detached) - : this (content, detached) + public SignedCms (SubjectIdentifierType signerIdentifierType, ContentInfo contentInfo, bool detached) + : this (contentInfo, detached) { _type = signerIdentifierType; } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs index b927fa2b71..9c83f3bb0a 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs @@ -46,8 +46,8 @@ namespace System.Security.Cryptography.Xml { { } - public CipherReference (string uri, TransformChain tc) - : base (uri, tc) + public CipherReference (string uri, TransformChain transformChain) + : base (uri, transformChain) { } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs index 23fedd437a..c3aa936668 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs @@ -48,8 +48,8 @@ namespace System.Security.Cryptography.Xml { ReferenceType = XmlEncryption.ElementNames.DataReference; } - public DataReference (string uri, TransformChain tc) - : base (uri, tc) + public DataReference (string uri, TransformChain transformChain) + : base (uri, transformChain) { ReferenceType = XmlEncryption.ElementNames.DataReference; } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs index 04f3799f8c..e748523cbc 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs @@ -55,11 +55,11 @@ namespace System.Security.Cryptography.Xml { TransformChain = new TransformChain (); } - protected EncryptedReference (string uri, TransformChain tc) + protected EncryptedReference (string uri, TransformChain transformChain) : this () { Uri = uri; - TransformChain = tc; + TransformChain = transformChain; } #endregion // Constructors diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs index 6dde9199a2..362f973e35 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs @@ -138,19 +138,19 @@ namespace System.Security.Cryptography.Xml { keyNameMapping.Clear (); } - public byte[] DecryptData (EncryptedData encryptedData, SymmetricAlgorithm symAlg) + public byte[] DecryptData (EncryptedData encryptedData, SymmetricAlgorithm symmetricAlgorithm) { if (encryptedData == null) throw new ArgumentNullException ("encryptedData"); - if (symAlg == null) - throw new ArgumentNullException ("symAlg"); + if (symmetricAlgorithm == null) + throw new ArgumentNullException ("symmetricAlgorithm"); - PaddingMode bak = symAlg.Padding; + PaddingMode bak = symmetricAlgorithm.Padding; try { - symAlg.Padding = Padding; - return Transform (encryptedData.CipherData.CipherValue, symAlg.CreateDecryptor (), symAlg.BlockSize / 8, true); + symmetricAlgorithm.Padding = Padding; + return Transform (encryptedData.CipherData.CipherValue, symmetricAlgorithm.CreateDecryptor (), symmetricAlgorithm.BlockSize / 8, true); } finally { - symAlg.Padding = bak; + symmetricAlgorithm.Padding = bak; } } @@ -186,25 +186,25 @@ namespace System.Security.Cryptography.Xml { return DecryptKey (encryptedKey.CipherData.CipherValue, (SymmetricAlgorithm) keyAlg); } - public static byte[] DecryptKey (byte[] keyData, SymmetricAlgorithm symAlg) + public static byte[] DecryptKey (byte[] keyData, SymmetricAlgorithm symmetricAlgorithm) { if (keyData == null) throw new ArgumentNullException ("keyData"); - if (symAlg == null) - throw new ArgumentNullException ("symAlg"); + if (symmetricAlgorithm == null) + throw new ArgumentNullException ("symmetricAlgorithm"); - if (symAlg is TripleDES) - return SymmetricKeyWrap.TripleDESKeyWrapDecrypt (symAlg.Key, keyData); - if (symAlg is Rijndael) - return SymmetricKeyWrap.AESKeyWrapDecrypt (symAlg.Key, keyData); + if (symmetricAlgorithm is TripleDES) + return SymmetricKeyWrap.TripleDESKeyWrapDecrypt (symmetricAlgorithm.Key, keyData); + if (symmetricAlgorithm is Rijndael) + return SymmetricKeyWrap.AESKeyWrapDecrypt (symmetricAlgorithm.Key, keyData); throw new CryptographicException ("The specified cryptographic transform is not supported."); } [MonoTODO ("Test this.")] - public static byte[] DecryptKey (byte[] keyData, RSA rsa, bool fOAEP) + public static byte[] DecryptKey (byte[] keyData, RSA rsa, bool useOAEP) { AsymmetricKeyExchangeDeformatter deformatter = null; - if (fOAEP) + if (useOAEP) deformatter = new RSAOAEPKeyExchangeDeformatter (rsa); else deformatter = new RSAPKCS1KeyExchangeDeformatter (rsa); @@ -254,19 +254,19 @@ namespace System.Security.Cryptography.Xml { throw new NotImplementedException (); } - public byte[] EncryptData (byte[] plainText, SymmetricAlgorithm symAlg) + public byte[] EncryptData (byte[] plaintext, SymmetricAlgorithm symmetricAlgorithm) { - if (plainText == null) - throw new ArgumentNullException ("plainText"); - if (symAlg == null) - throw new ArgumentNullException ("symAlg"); + if (plaintext == null) + throw new ArgumentNullException ("plaintext"); + if (symmetricAlgorithm == null) + throw new ArgumentNullException ("symmetricAlgorithm"); - PaddingMode bak = symAlg.Padding; + PaddingMode bak = symmetricAlgorithm.Padding; try { - symAlg.Padding = Padding; - return EncryptDataCore (plainText, symAlg); + symmetricAlgorithm.Padding = Padding; + return EncryptDataCore (plaintext, symmetricAlgorithm); } finally { - symAlg.Padding = bak; + symmetricAlgorithm.Padding = bak; } } @@ -289,37 +289,37 @@ namespace System.Security.Cryptography.Xml { return output; } - public byte[] EncryptData (XmlElement inputElement, SymmetricAlgorithm symAlg, bool content) + public byte[] EncryptData (XmlElement inputElement, SymmetricAlgorithm symmetricAlgorithm, bool content) { if (inputElement == null) throw new ArgumentNullException ("inputElement"); if (content) - return EncryptData (Encoding.GetBytes (inputElement.InnerXml), symAlg); + return EncryptData (Encoding.GetBytes (inputElement.InnerXml), symmetricAlgorithm); else - return EncryptData (Encoding.GetBytes (inputElement.OuterXml), symAlg); + return EncryptData (Encoding.GetBytes (inputElement.OuterXml), symmetricAlgorithm); } - public static byte[] EncryptKey (byte[] keyData, SymmetricAlgorithm symAlg) + public static byte[] EncryptKey (byte[] keyData, SymmetricAlgorithm symmetricAlgorithm) { if (keyData == null) throw new ArgumentNullException ("keyData"); - if (symAlg == null) - throw new ArgumentNullException ("symAlg"); + if (symmetricAlgorithm == null) + throw new ArgumentNullException ("symmetricAlgorithm"); - if (symAlg is TripleDES) - return SymmetricKeyWrap.TripleDESKeyWrapEncrypt (symAlg.Key, keyData); - if (symAlg is Rijndael) - return SymmetricKeyWrap.AESKeyWrapEncrypt (symAlg.Key, keyData); + if (symmetricAlgorithm is TripleDES) + return SymmetricKeyWrap.TripleDESKeyWrapEncrypt (symmetricAlgorithm.Key, keyData); + if (symmetricAlgorithm is Rijndael) + return SymmetricKeyWrap.AESKeyWrapEncrypt (symmetricAlgorithm.Key, keyData); throw new CryptographicException ("The specified cryptographic transform is not supported."); } [MonoTODO ("Test this.")] - public static byte[] EncryptKey (byte[] keyData, RSA rsa, bool fOAEP) + public static byte[] EncryptKey (byte[] keyData, RSA rsa, bool useOAEP) { AsymmetricKeyExchangeFormatter formatter = null; - if (fOAEP) + if (useOAEP) formatter = new RSAOAEPKeyExchangeFormatter (rsa); else formatter = new RSAPKCS1KeyExchangeFormatter (rsa); @@ -402,25 +402,25 @@ namespace System.Security.Cryptography.Xml { throw new ArgumentException ("keyAlg"); } - public virtual byte[] GetDecryptionIV (EncryptedData encryptedData, string symAlgUri) + public virtual byte[] GetDecryptionIV (EncryptedData encryptedData, string symmetricAlgorithmUri) { if (encryptedData == null) throw new ArgumentNullException ("encryptedData"); - SymmetricAlgorithm symAlg = GetAlgorithm (symAlgUri); + SymmetricAlgorithm symAlg = GetAlgorithm (symmetricAlgorithmUri); byte[] iv = new Byte [symAlg.BlockSize / 8]; Buffer.BlockCopy (encryptedData.CipherData.CipherValue, 0, iv, 0, iv.Length); return iv; } - public virtual SymmetricAlgorithm GetDecryptionKey (EncryptedData encryptedData, string symAlgUri) + public virtual SymmetricAlgorithm GetDecryptionKey (EncryptedData encryptedData, string symmetricAlgorithmUri) { if (encryptedData == null) throw new ArgumentNullException ("encryptedData"); - if (symAlgUri == null) + if (symmetricAlgorithmUri == null) return null; - SymmetricAlgorithm symAlg = GetAlgorithm (symAlgUri); + SymmetricAlgorithm symAlg = GetAlgorithm (symmetricAlgorithmUri); symAlg.IV = GetDecryptionIV (encryptedData, encryptedData.EncryptionMethod.KeyAlgorithm); KeyInfo keyInfo = encryptedData.KeyInfo; foreach (KeyInfoClause clause in keyInfo) { diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs index 91815a19a3..cd68158bf0 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs @@ -48,9 +48,9 @@ namespace System.Security.Cryptography.Xml { KeyAlgorithm = null; } - public EncryptionMethod (string strAlgorithm) + public EncryptionMethod (string algorithm) { - KeyAlgorithm = strAlgorithm; + KeyAlgorithm = algorithm; } #endregion // Constructors diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs index eee49e6b6a..ca662892da 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs @@ -47,9 +47,9 @@ namespace System.Security.Cryptography.Xml { { } - public EncryptionProperty (XmlElement elemProp) + public EncryptionProperty (XmlElement elementProperty) { - LoadXml (elemProp); + LoadXml (elementProperty); } #endregion // Constructors diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs index afd079b7dc..62aa8afd3c 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs @@ -48,9 +48,9 @@ namespace System.Security.Cryptography.Xml { { } - public KeyInfoEncryptedKey (EncryptedKey ek) + public KeyInfoEncryptedKey (EncryptedKey encryptedKey) { - EncryptedKey = ek; + EncryptedKey = encryptedKey; } #endregion // Constructors diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs index 2732de63be..532ba5ca2c 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs @@ -49,10 +49,10 @@ namespace System.Security.Cryptography.Xml { URI = strUri; } - public KeyInfoRetrievalMethod (string strUri, string strType) + public KeyInfoRetrievalMethod (string strUri, string typeName) : this (strUri) { - Type = strType; + Type = typeName; } [ComVisible (false)] diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs index 2fe171e72f..ba33bf25b3 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs @@ -48,8 +48,8 @@ namespace System.Security.Cryptography.Xml { ReferenceType = XmlEncryption.ElementNames.KeyReference; } - public KeyReference (string uri, TransformChain tc) - : base (uri, tc) + public KeyReference (string uri, TransformChain transformChain) + : base (uri, transformChain) { ReferenceType = XmlEncryption.ElementNames.KeyReference; } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs index 05c2b091d9..2ebec98094 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs @@ -624,34 +624,36 @@ namespace System.Security.Cryptography.Xml { public void ComputeSignature () { - if (key != null) { - if (m_signature.SignedInfo.SignatureMethod == null) - // required before hashing - m_signature.SignedInfo.SignatureMethod = key.SignatureAlgorithm; - else if (m_signature.SignedInfo.SignatureMethod != key.SignatureAlgorithm) - throw new CryptographicException ("Specified SignatureAlgorithm is not supported by the signing key."); - DigestReferences (); + DigestReferences (); - AsymmetricSignatureFormatter signer = null; - // in need for a CryptoConfig factory - if (key is DSA) - signer = new DSASignatureFormatter (key); - else if (key is RSA) - signer = new RSAPKCS1SignatureFormatter (key); + if (key == null) + throw new CryptographicException (SR.Cryptography_Xml_LoadKeyFailed); - if (signer != null) { - SignatureDescription sd = (SignatureDescription) CryptoConfig.CreateFromName (m_signature.SignedInfo.SignatureMethod); - - HashAlgorithm hash = GetHash (sd.DigestAlgorithm, false); - // get the hash of the C14N SignedInfo element - byte[] digest = hash.ComputeHash (SignedInfoTransformed ()); - - signer.SetHashAlgorithm ("SHA1"); - m_signature.SignatureValue = signer.CreateSignature (digest); + // Check the signature algorithm associated with the key so that we can accordingly set the signature method + if (SignedInfo.SignatureMethod == null) { + if (key is DSA) { + SignedInfo.SignatureMethod = XmlDsigDSAUrl; + } else if (key is RSA) { + // Default to RSA-SHA1 + SignedInfo.SignatureMethod = XmlDsigRSASHA1Url; + } else { + throw new CryptographicException (SR.Cryptography_Xml_CreatedKeyFailed); } } - else - throw new CryptographicException ("signing key is not specified"); + + // See if there is a signature description class defined in the Config file + SignatureDescription signatureDescription = CryptoConfig.CreateFromName (SignedInfo.SignatureMethod) as SignatureDescription; + if (signatureDescription == null) + throw new CryptographicException (SR.Cryptography_Xml_SignatureDescriptionNotCreated); + + HashAlgorithm hashAlg = signatureDescription.CreateDigest (); + if (hashAlg == null) + throw new CryptographicException (SR.Cryptography_Xml_CreateHashAlgorithmFailed); + + byte[] hashvalue = hashAlg.ComputeHash (SignedInfoTransformed ()); + AsymmetricSignatureFormatter asymmetricSignatureFormatter = signatureDescription.CreateFormatter (key); + + m_signature.SignatureValue = asymmetricSignatureFormatter.CreateSignature (hashAlg); } public void ComputeSignature (KeyedHashAlgorithm macAlg) diff --git a/mcs/class/System.Security/System.Security.Permissions/DataProtectionPermission.cs b/mcs/class/System.Security/System.Security.Permissions/DataProtectionPermission.cs index e36b30e12b..43560cd40c 100644 --- a/mcs/class/System.Security/System.Security.Permissions/DataProtectionPermission.cs +++ b/mcs/class/System.Security/System.Security.Permissions/DataProtectionPermission.cs @@ -45,10 +45,10 @@ namespace System.Security.Permissions { _flags = DataProtectionPermissionFlags.AllFlags; } - public DataProtectionPermission (DataProtectionPermissionFlags flags) + public DataProtectionPermission (DataProtectionPermissionFlags flag) { // reuse validation by the Flags property - Flags = flags; + Flags = flag; } @@ -114,15 +114,15 @@ namespace System.Security.Permissions { return ((_flags & ~dp._flags) == 0); } - public override void FromXml (SecurityElement e) + public override void FromXml (SecurityElement securityElement) { // General validation in CodeAccessPermission - PermissionHelper.CheckSecurityElement (e, "e", version, version); + PermissionHelper.CheckSecurityElement (securityElement, "securityElement", version, version); // Note: we do not (yet) care about the return value // as we only accept version 1 (min/max values) _flags = (DataProtectionPermissionFlags) Enum.Parse ( - typeof (DataProtectionPermissionFlags), e.Attribute ("Flags")); + typeof (DataProtectionPermissionFlags), securityElement.Attribute ("Flags")); } public override SecurityElement ToXml () diff --git a/mcs/class/System.Security/System.Security.dll.sources b/mcs/class/System.Security/System.Security.dll.sources index 0b94dd5b9a..0beec42df4 100644 --- a/mcs/class/System.Security/System.Security.dll.sources +++ b/mcs/class/System.Security/System.Security.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +corefx/SR.cs ../../build/common/Consts.cs ../../build/common/Locale.cs Mono.Security.Cryptography/ManagedProtection.cs diff --git a/mcs/class/System.Security/System.Security_test.dll.sources b/mcs/class/System.Security/System.Security_test.dll.sources index 90a4d3517e..b8059fe7a1 100644 --- a/mcs/class/System.Security/System.Security_test.dll.sources +++ b/mcs/class/System.Security/System.Security_test.dll.sources @@ -1,3 +1,4 @@ +../corefx/SR.cs System.Security.Cryptography/CryptographicAttributeObjectCollectionTest.cs System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs System.Security.Cryptography/CryptographicAttributeTest.cs diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs index 0a71f570a9..1c1d7a9777 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs @@ -30,8 +30,68 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } + /// + /// This class is for testing purposes only. It allows to reproduce an error + /// that happens when an unsupported signing key is being used + /// while computing a signature. + /// + internal sealed class CustomAsymmetricAlgorithm : AsymmetricAlgorithm { + } + + /// + /// This class is for testing purposes only. It allows to reproduce an error + /// that happens when the hash algorithm cannot be created. + /// + public sealed class BadHashAlgorithmSignatureDescription : SignatureDescription { + public BadHashAlgorithmSignatureDescription () + { + KeyAlgorithm = RSA.Create ().GetType ().FullName; + DigestAlgorithm = SHA1.Create ().GetType ().FullName; + FormatterAlgorithm = typeof (RSAPKCS1SignatureFormatter).FullName; + DeformatterAlgorithm = typeof (RSAPKCS1SignatureDeformatter).FullName; + } + + public override HashAlgorithm CreateDigest () + { + return null; + } + } + + /// + /// This class is for testing purposes only. + /// It represents a correctly defined custom signature description. + /// + public sealed class RsaPkcs1Sha512SignatureDescription : SignatureDescription { + private const string Sha512HashAlgorithm = "SHA512"; + + public RsaPkcs1Sha512SignatureDescription () + { + KeyAlgorithm = RSA.Create ().GetType ().FullName; + DigestAlgorithm = SHA512.Create ().GetType ().FullName; + FormatterAlgorithm = typeof (RSAPKCS1SignatureFormatter).FullName; + DeformatterAlgorithm = typeof (RSAPKCS1SignatureDeformatter).FullName; + } + + public override AsymmetricSignatureFormatter CreateFormatter (AsymmetricAlgorithm key) + { + var formatter = new RSAPKCS1SignatureFormatter (key); + formatter.SetHashAlgorithm (Sha512HashAlgorithm); + + return formatter; + } + + public override AsymmetricSignatureDeformatter CreateDeformatter (AsymmetricAlgorithm key) + { + var deformatter = new RSAPKCS1SignatureDeformatter (key); + deformatter.SetHashAlgorithm (Sha512HashAlgorithm); + + return deformatter; + } + } + [TestFixture] public class SignedXmlTest { + private const string XmlDsigNamespacePrefix = "ds"; private const string signature = "CTnnhjxUQHJmD+t1MjVXrOW+MCA=dbFt6Zw3vR+Xh7LbM/vuifyFA7gPh/NlDM2Glz/SJBsveISieuTBpZlk/zavAeuXR/Nu0Ztt4OP4tCOg09a2RNlrTP0dhkeEfL1jTzpnVaLHuQbCiwOWCgbRif7Xt7N12FuiHYb3BltP/YyXS4E12NxlGlqnDiFA1v/mkK5+C1o=hEfTJNa2idz2u+fSYDDG4Lx/xuk4aBbvOPVNqgc1l9Y8t7Pt+ZyF+kkF3uUl8Y0700BFGAsprnhwrWENK+PGdtvM5796ZKxCCa0ooKkofiT4355HqK26hpV8dvj38vq/rkJe1jHZgkTKa+c/0vjcYZOI/RT/IZv9JfXxVWLuLxk=EQ=="; @@ -1548,5 +1608,164 @@ namespace MonoTests.System.Security.Cryptography.Xml { SignedXml sign = GetSignedXml (xml); sign.CheckSignature (new HMACSHA1 (Encoding.ASCII.GetBytes ("no clue"))); } + + [Test] + public void ComputeSignature_WhenSigningKeyIsNotSpecified_ThrowsCryptographicException () + { + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.AddReference (reference); + + var ex = Assert.Throws (() => signedXml.ComputeSignature(), "Exception"); + Assert.That (ex.Message, Is.EqualTo (SR.Cryptography_Xml_LoadKeyFailed), "Message"); + } + + [Test] + public void ComputeSignature_WhenSignatureMethodIsNotSpecifiedAndRsaSigningKeyIsUsed_UsesRsaSha1Algorithm () + { + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = RSA.Create (); + signedXml.AddReference (reference); + + signedXml.ComputeSignature (); + + var signature = signedXml.GetXml (); + + var namespaceManager = new XmlNamespaceManager (signature.OwnerDocument.NameTable); + namespaceManager.AddNamespace ("ds", SignedXml.XmlDsigNamespaceUrl); + + var signatureMethodElement = signature.SelectSingleNode ( + string.Format ("/{0}:SignedInfo/{0}:SignatureMethod", XmlDsigNamespacePrefix), + namespaceManager); + + Assert.That (signatureMethodElement.Attributes["Algorithm"].Value, Is.EqualTo (SignedXml.XmlDsigRSASHA1Url)); + } + + [Test] + public void ComputeSignature_WhenSignatureMethodIsNotSpecifiedAndDsaSigningKeyIsUsed_UsesDsaSha1Algorithm () + { + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = DSA.Create (); + signedXml.AddReference (reference); + + signedXml.ComputeSignature (); + + var signature = signedXml.GetXml (); + + var namespaceManager = new XmlNamespaceManager (signature.OwnerDocument.NameTable); + namespaceManager.AddNamespace ("ds", SignedXml.XmlDsigNamespaceUrl); + + var signatureMethodElement = signature.SelectSingleNode ( + string.Format ("/{0}:SignedInfo/{0}:SignatureMethod", XmlDsigNamespacePrefix), + namespaceManager); + + Assert.That (signatureMethodElement.Attributes["Algorithm"].Value, Is.EqualTo (SignedXml.XmlDsigDSAUrl)); + } + + [Test] + public void ComputeSignature_WhenSignatureMethodIsNotSpecifiedAndNotSupportedSigningKeyIsUsed_ThrowsCryptographicException () + { + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = new CustomAsymmetricAlgorithm (); + signedXml.AddReference (reference); + + var ex = Assert.Throws (() => signedXml.ComputeSignature (), "Exception"); + Assert.That (ex.Message, Is.EqualTo (SR.Cryptography_Xml_CreatedKeyFailed), "Message"); + } + + [Test] + public void ComputeSignature_WhenNotSupportedSignatureMethodIsSpecified_ThrowsCryptographicException () + { + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = RSA.Create (); + signedXml.SignedInfo.SignatureMethod = "not supported signature method"; + signedXml.AddReference (reference); + + var ex = Assert.Throws (() => signedXml.ComputeSignature(), "Exception"); + Assert.That (ex.Message, Is.EqualTo (SR.Cryptography_Xml_SignatureDescriptionNotCreated), "Message"); + } + + [Test] + public void ComputeSignature_WhenNotSupportedSignatureHashAlgorithmIsSpecified_ThrowsCryptographicException () + { + const string algorithmName = "not supported signature hash algorithm"; + + CryptoConfig.AddAlgorithm (typeof (BadHashAlgorithmSignatureDescription), algorithmName); + + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = RSA.Create (); + signedXml.SignedInfo.SignatureMethod = algorithmName; + signedXml.AddReference (reference); + + var ex = Assert.Throws (() => signedXml.ComputeSignature (), "Exception"); + Assert.That (ex.Message, Is.EqualTo (SR.Cryptography_Xml_CreateHashAlgorithmFailed), "Message"); + } + + [Test] + public void ComputeSignature_WhenCustomSignatureMethodIsSpecified_UsesCustomAlgorithm () + { + const string algorithmName = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"; + + CryptoConfig.AddAlgorithm (typeof (RsaPkcs1Sha512SignatureDescription), algorithmName); + + var unsignedXml = new XmlDocument (); + unsignedXml.LoadXml (""); + + var reference = new Reference { Uri = "" }; + reference.AddTransform (new XmlDsigEnvelopedSignatureTransform ()); + + var signedXml = new SignedXml (unsignedXml); + signedXml.SigningKey = RSA.Create (); + signedXml.SignedInfo.SignatureMethod = algorithmName; + signedXml.AddReference (reference); + + signedXml.ComputeSignature (); + + var signature = signedXml.GetXml (); + + var namespaceManager = new XmlNamespaceManager (signature.OwnerDocument.NameTable); + namespaceManager.AddNamespace ("ds", SignedXml.XmlDsigNamespaceUrl); + + var signatureMethodElement = signature.SelectSingleNode ( + string.Format ("/{0}:SignedInfo/{0}:SignatureMethod", XmlDsigNamespacePrefix), + namespaceManager); + + Assert.That (signatureMethodElement.Attributes["Algorithm"].Value, Is.EqualTo (algorithmName)); + } } -} +} \ No newline at end of file diff --git a/mcs/class/System.Security/corefx/SR.cs b/mcs/class/System.Security/corefx/SR.cs new file mode 100644 index 0000000000..6b6ac476f5 --- /dev/null +++ b/mcs/class/System.Security/corefx/SR.cs @@ -0,0 +1,93 @@ +// +// This file was generated by resx2sr tool +// + +partial class SR +{ + public const string ArgumentOutOfRange_Index = "Index was out of range. Must be non-negative and less than the size of the collection."; + public const string Arg_EmptyOrNullString = "String cannot be empty or null."; + public const string Cryptography_Partial_Chain = "A certificate chain could not be built to a trusted root authority."; + public const string Cryptography_Xml_BadWrappedKeySize = "Bad wrapped key size."; + public const string Cryptography_Xml_CipherValueElementRequired = "A Cipher Data element should have either a CipherValue or a CipherReference element."; + public const string Cryptography_Xml_CreateHashAlgorithmFailed = "Could not create hash algorithm object."; + public const string Cryptography_Xml_CreateTransformFailed = "Could not create the XML transformation identified by the URI {0}."; + public const string Cryptography_Xml_CreatedKeyFailed = "Failed to create signing key."; + public const string Cryptography_Xml_DigestMethodRequired = "A DigestMethod must be specified on a Reference prior to generating XML."; + public const string Cryptography_Xml_DigestValueRequired = "A Reference must contain a DigestValue."; + public const string Cryptography_Xml_EnvelopedSignatureRequiresContext = "An XmlDocument context is required for enveloped transforms."; + public const string Cryptography_Xml_InvalidElement = "Malformed element {0}."; + public const string Cryptography_Xml_InvalidEncryptionProperty = "Malformed encryption property element."; + public const string Cryptography_Xml_InvalidKeySize = "The key size should be a non negative integer."; + public const string Cryptography_Xml_InvalidReference = "Malformed reference element."; + public const string Cryptography_Xml_InvalidSignatureLength = "The length of the signature with a MAC should be less than the hash output length."; + public const string Cryptography_Xml_InvalidSignatureLength2 = "The length in bits of the signature with a MAC should be a multiple of 8."; + public const string Cryptography_Xml_KeyInfoRequired = "A KeyInfo element is required to check the signature."; + public const string Cryptography_Xml_KW_BadKeySize = "The length of the encrypted data in Key Wrap is either 32, 40 or 48 bytes."; + public const string Cryptography_Xml_LoadKeyFailed = "Signing key is not loaded."; + public const string Cryptography_Xml_MissingAlgorithm = "Symmetric algorithm is not specified."; + public const string Cryptography_Xml_MissingCipherData = "Cipher data is not specified."; + public const string Cryptography_Xml_MissingDecryptionKey = "Unable to retrieve the decryption key."; + public const string Cryptography_Xml_MissingEncryptionKey = "Unable to retrieve the encryption key."; + public const string Cryptography_Xml_NotSupportedCryptographicTransform = "The specified cryptographic transform is not supported."; + public const string Cryptography_Xml_ReferenceElementRequired = "At least one Reference element is required."; + public const string Cryptography_Xml_ReferenceTypeRequired = "The Reference type must be set in an EncryptedReference object."; + public const string Cryptography_Xml_SelfReferenceRequiresContext = "An XmlDocument context is required to resolve the Reference Uri {0}."; + public const string Cryptography_Xml_SignatureDescriptionNotCreated = "SignatureDescription could not be created for the signature algorithm supplied."; + public const string Cryptography_Xml_SignatureMethodKeyMismatch = "The key does not fit the SignatureMethod."; + public const string Cryptography_Xml_SignatureMethodRequired = "A signature method is required."; + public const string Cryptography_Xml_SignatureValueRequired = "Signature requires a SignatureValue."; + public const string Cryptography_Xml_SignedInfoRequired = "Signature requires a SignedInfo."; + public const string Cryptography_Xml_TransformIncorrectInputType = "The input type was invalid for this transform."; + public const string Cryptography_Xml_IncorrectObjectType = "Type of input object is invalid."; + public const string Cryptography_Xml_UnknownTransform = "Unknown transform has been encountered."; + public const string Cryptography_Xml_UriNotResolved = "Unable to resolve Uri {0}."; + public const string Cryptography_Xml_UriNotSupported = " The specified Uri is not supported."; + public const string Cryptography_Xml_UriRequired = "A Uri attribute is required for a CipherReference element."; + public const string Cryptography_Xml_XrmlMissingContext = "Null Context property encountered."; + public const string Cryptography_Xml_XrmlMissingIRelDecryptor = "IRelDecryptor is required."; + public const string Cryptography_Xml_XrmlMissingIssuer = "Issuer node is required."; + public const string Cryptography_Xml_XrmlMissingLicence = "License node is required."; + public const string Cryptography_Xml_XrmlUnableToDecryptGrant = "Unable to decrypt grant content."; + public const string NotSupported_KeyAlgorithm = "The certificate key algorithm is not supported."; + public const string Log_ActualHashValue = "Actual hash value: {0}"; + public const string Log_BeginCanonicalization = "Beginning canonicalization using \"{0}\" ({1})."; + public const string Log_BeginSignatureComputation = "Beginning signature computation."; + public const string Log_BeginSignatureVerification = "Beginning signature verification."; + public const string Log_BuildX509Chain = "Building and verifying the X509 chain for certificate {0}."; + public const string Log_CanonicalizationSettings = "Canonicalization transform is using resolver {0} and base URI \"{1}\"."; + public const string Log_CanonicalizedOutput = "Output of canonicalization transform: {0}"; + public const string Log_CertificateChain = "Certificate chain:"; + public const string Log_CheckSignatureFormat = "Checking signature format using format validator \"[{0}] {1}.{2}\"."; + public const string Log_CheckSignedInfo = "Checking signature on SignedInfo with id \"{0}\"."; + public const string Log_FormatValidationSuccessful = "Signature format validation was successful."; + public const string Log_FormatValidationNotSuccessful = "Signature format validation failed."; + public const string Log_KeyUsages = "Found key usages \"{0}\" in extension {1} on certificate {2}."; + public const string Log_NoNamespacesPropagated = "No namespaces are being propagated."; + public const string Log_PropagatingNamespace = "Propagating namespace {0}=\"{1}\"."; + public const string Log_RawSignatureValue = "Raw signature: {0}"; + public const string Log_ReferenceHash = "Reference {0} hashed with \"{1}\" ({2}) has hash value {3}, expected hash value {4}."; + public const string Log_RevocationMode = "Revocation mode for chain building: {0}."; + public const string Log_RevocationFlag = "Revocation flag for chain building: {0}."; + public const string Log_SigningAsymmetric = "Calculating signature with key {0} using signature description {1}, hash algorithm {2}, and asymmetric signature formatter {3}."; + public const string Log_SigningHmac = "Calculating signature using keyed hash algorithm {0}."; + public const string Log_SigningReference = "Hashing reference {0}, Uri \"{1}\", Id \"{2}\", Type \"{3}\" with hash algorithm \"{4}\" ({5})."; + public const string Log_TransformedReferenceContents = "Transformed reference contents: {0}"; + public const string Log_UnsafeCanonicalizationMethod = "Canonicalization method \"{0}\" is not on the safe list. Safe canonicalization methods are: {1}."; + public const string Log_UrlTimeout = "URL retrieval timeout for chain building: {0}."; + public const string Log_VerificationFailed = "Verification failed checking {0}."; + public const string Log_VerificationFailed_References = "references"; + public const string Log_VerificationFailed_SignedInfo = "SignedInfo"; + public const string Log_VerificationFailed_X509Chain = "X509 chain verification"; + public const string Log_VerificationFailed_X509KeyUsage = "X509 key usage verification"; + public const string Log_VerificationFlag = "Verification flags for chain building: {0}."; + public const string Log_VerificationTime = "Verification time for chain building: {0}."; + public const string Log_VerificationWithKeySuccessful = "Verification with key {0} was successful."; + public const string Log_VerificationWithKeyNotSuccessful = "Verification with key {0} was not successful."; + public const string Log_VerifyReference = "Processing reference {0}, Uri \"{1}\", Id \"{2}\", Type \"{3}\"."; + public const string Log_VerifySignedInfoAsymmetric = "Verifying SignedInfo using key {0}, signature description {1}, hash algorithm {2}, and asymmetric signature deformatter {3}."; + public const string Log_VerifySignedInfoHmac = "Verifying SignedInfo using keyed hash algorithm {0}."; + public const string Log_X509ChainError = "Error building X509 chain: {0}: {1}."; + public const string Log_XmlContext = "Using context: {0}"; + public const string Log_SignedXmlRecursionLimit = "Signed xml recursion limit hit while trying to decrypt the key. Reference {0} hashed with \"{1}\" and ({2})."; + public const string Log_UnsafeTransformMethod = "Transform method \"{0}\" is not on the safe list. Safe transform methods are: {1}."; +} \ No newline at end of file diff --git a/mcs/class/System.Security/orbis_System.Security.dll.sources b/mcs/class/System.Security/orbis_System.Security.dll.sources new file mode 100644 index 0000000000..599b7fa67f --- /dev/null +++ b/mcs/class/System.Security/orbis_System.Security.dll.sources @@ -0,0 +1 @@ +#include common_System.Security.dll.sources diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs index 9dbb1ed607..7166a0330f 100644 --- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs +++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs @@ -126,7 +126,7 @@ namespace System.ServiceModel.Discovery.Configuration // It seems to do nothing. } - protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement) + protected override void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement) { // It seems to do nothing. } diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs index ad09f0567c..5e6af3f8ee 100644 --- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs +++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs @@ -142,10 +142,10 @@ namespace System.ServiceModel.Discovery.Configuration base.OnInitializeAndValidate (channelEndpointElement); } - protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement) + protected override void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement) { // It seems to do nothing. - base.OnInitializeAndValidate (channelEndpointElement); + base.OnInitializeAndValidate (serviceEndpointElement); } } } diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs index 8ac3d43a3e..ece16ae6fc 100644 --- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs +++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs @@ -150,10 +150,10 @@ namespace System.ServiceModel.Discovery.Configuration base.OnInitializeAndValidate (channelEndpointElement); } - protected override void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement) + protected override void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement) { // It seems to do nothing. - base.OnInitializeAndValidate (channelEndpointElement); + base.OnInitializeAndValidate (serviceEndpointElement); } } } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs index 0c181289d2..7e2a31e73a 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs @@ -64,8 +64,8 @@ namespace System.ServiceModel.Syndication { } - public Atom10ItemFormatter (SyndicationItem feedToWrite) - : base (feedToWrite) + public Atom10ItemFormatter (SyndicationItem itemToWrite) + : base (itemToWrite) { } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs index 1191c92b2b..1393a62493 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs @@ -75,9 +75,9 @@ namespace System.ServiceModel.Syndication return new XmlSyndicationContent (null, xmlSerializerObject, serializer); } - public static XmlSyndicationContent CreateXmlContent (XmlReader reader) + public static XmlSyndicationContent CreateXmlContent (XmlReader xmlReader) { - return new XmlSyndicationContent (reader); + return new XmlSyndicationContent (xmlReader); } #endregion diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs index 10f786c2ff..1726b78ede 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs @@ -62,24 +62,24 @@ namespace System.ServiceModel.Syndication { } - public SyndicationItem (string title, string content, Uri feedAlternateLink) - : this (title, content, feedAlternateLink, null, default (DateTimeOffset)) + public SyndicationItem (string title, string content, Uri itemAlternateLink) + : this (title, content, itemAlternateLink, null, default (DateTimeOffset)) { } - public SyndicationItem (string title, string content, Uri feedAlternateLink, string id, + public SyndicationItem (string title, string content, Uri itemAlternateLink, string id, DateTimeOffset lastUpdatedTime) - : this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, feedAlternateLink, id, lastUpdatedTime) + : this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, itemAlternateLink, id, lastUpdatedTime) { } - public SyndicationItem (string title, SyndicationContent content, Uri feedAlternateLink, string id, + public SyndicationItem (string title, SyndicationContent content, Uri itemAlternateLink, string id, DateTimeOffset lastUpdatedTime) { Title = title != null ? new TextSyndicationContent (title) : null; Content = content; - if (feedAlternateLink != null) - AddPermalink (feedAlternateLink); + if (itemAlternateLink != null) + AddPermalink (itemAlternateLink); Id = id; LastUpdatedTime = lastUpdatedTime; } @@ -210,11 +210,11 @@ namespace System.ServiceModel.Syndication set { title = value; } } - public void AddPermalink (Uri link) + public void AddPermalink (Uri permalink) { - if (link == null) - throw new ArgumentNullException ("link"); - Links.Add (SyndicationLink.CreateAlternateLink (link)); + if (permalink == null) + throw new ArgumentNullException ("permalink"); + Links.Add (SyndicationLink.CreateAlternateLink (permalink)); } public virtual SyndicationItem Clone () diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs index b380fd834a..174f06b584 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs @@ -119,9 +119,9 @@ namespace System.ServiceModel.Syndication return extension.GetObject (); } - public TContent ReadContent (XmlObjectSerializer serializer) + public TContent ReadContent (XmlObjectSerializer dataContractSerializer) { - return extension.GetObject (serializer); + return extension.GetObject (dataContractSerializer); } public TContent ReadContent (XmlSerializer serializer) diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs index 4a5289dd51..c05cf8f0c8 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs @@ -56,13 +56,13 @@ namespace System.ServiceModel.Web } #endif - public WebChannelFactory(Type serviceType) - : base (serviceType) + public WebChannelFactory(Type channelType) + : base (channelType) { } - public WebChannelFactory (string configurationName) - : base (configurationName) + public WebChannelFactory (string endpointConfigurationName) + : base (endpointConfigurationName) { } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs index a372b24c6b..3e8e500329 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs @@ -68,15 +68,15 @@ namespace System.ServiceModel.Web OutgoingWebRequestContext outgoing_request; OutgoingWebResponseContext outgoing_response; - public WebOperationContext (OperationContext operation) + public WebOperationContext (OperationContext operationContext) { - if (operation == null) - throw new ArgumentNullException ("operation"); + if (operationContext == null) + throw new ArgumentNullException ("operationContext"); outgoing_request = new OutgoingWebRequestContext (); - incoming_response = new IncomingWebResponseContext (operation); + incoming_response = new IncomingWebResponseContext (operationContext); #if !MOBILE - incoming_request = new IncomingWebRequestContext (operation); + incoming_request = new IncomingWebRequestContext (operationContext); outgoing_response = new OutgoingWebResponseContext (); #endif } @@ -101,12 +101,12 @@ namespace System.ServiceModel.Web } #endif - public void Attach (OperationContext context) + public void Attach (OperationContext owner) { // do nothing } - public void Detach (OperationContext context) + public void Detach (OperationContext owner) { // do nothing } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs index df3dd8f16f..2a71219697 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs @@ -45,9 +45,9 @@ namespace System.ServiceModel { } - public WebHttpBinding (WebHttpSecurityMode mode) + public WebHttpBinding (WebHttpSecurityMode securityMode) { - Initialize (mode); + Initialize (securityMode); } public WebHttpBinding (string configurationName) diff --git a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs index 3a6629e57b..60ddd55592 100644 --- a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs +++ b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs @@ -35,8 +35,8 @@ namespace System public class UriTemplateMatchException : SystemException { public UriTemplateMatchException () : base () {} - public UriTemplateMatchException (string msg) : base (msg) {} - public UriTemplateMatchException (string msg, Exception inner) : base (msg, inner) {} + public UriTemplateMatchException (string message) : base (message) {} + public UriTemplateMatchException (string message, Exception innerException) : base (message, innerException) {} protected UriTemplateMatchException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/Dummy_2_1.cs b/mcs/class/System.ServiceModel/Dummy_2_1.cs index fd890ec76e..2773e6a93c 100644 --- a/mcs/class/System.ServiceModel/Dummy_2_1.cs +++ b/mcs/class/System.ServiceModel/Dummy_2_1.cs @@ -35,7 +35,7 @@ namespace System.ServiceModel get { throw new NotImplementedException (); } } - IExtensionCollection IExtensibleObject.Extensions + public IExtensionCollection Extensions { get { throw new NotImplementedException (); } } diff --git a/mcs/class/System.ServiceModel/Dummy_XM_4_5.cs b/mcs/class/System.ServiceModel/Dummy_XM_4_5.cs index c36efe1ad2..989c4dddc5 100644 --- a/mcs/class/System.ServiceModel/Dummy_XM_4_5.cs +++ b/mcs/class/System.ServiceModel/Dummy_XM_4_5.cs @@ -22,7 +22,7 @@ namespace System.ServiceModel get { throw new NotImplementedException (); } } - IExtensionCollection IExtensibleObject.Extensions + public IExtensionCollection Extensions { get { throw new NotImplementedException (); } } diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs index 3e79f9e85a..dc046928ad 100644 --- a/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs +++ b/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs @@ -65,14 +65,14 @@ namespace System.Collections.Generic return list; } - protected override void InsertItem (int index, TItem kind) + protected override void InsertItem (int index, TItem item) { - base.InsertItem (index, kind); + base.InsertItem (index, item); } - protected override void SetItem (int index, TItem kind) + protected override void SetItem (int index, TItem item) { - base.SetItem (index, kind); + base.SetItem (index, item); } public T Remove () diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs index 5e47797fc3..b110d15f24 100644 --- a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs +++ b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs @@ -57,10 +57,10 @@ namespace System.Collections.Generic } protected SynchronizedKeyedCollection (object syncRoot, - IEqualityComparer comparer, int capacity) + IEqualityComparer comparer, int dictionaryCreationThreshold) : base (syncRoot) { - dict = new Dictionary (capacity, comparer); + dict = new Dictionary (dictionaryCreationThreshold, comparer); } // see bug #76417 diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs index fdc7c3e56e..b7924ff5a7 100644 --- a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs +++ b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs @@ -43,25 +43,25 @@ namespace System.Collections.Generic { } - public SynchronizedReadOnlyCollection (object sync_root) - : this (sync_root, new List ()) + public SynchronizedReadOnlyCollection (object syncRoot) + : this (syncRoot, new List ()) { } - public SynchronizedReadOnlyCollection (object sync_root, IEnumerable list) + public SynchronizedReadOnlyCollection (object syncRoot, IEnumerable list) { - if (sync_root == null) - throw new ArgumentNullException ("sync_root"); + if (syncRoot == null) + throw new ArgumentNullException ("syncRoot"); if (list == null) throw new ArgumentNullException ("list"); - this.sync_root = sync_root; + this.sync_root = syncRoot; this.l = new List (list); } - public SynchronizedReadOnlyCollection (object sync_root, params T [] list) - : this (sync_root, (IEnumerable) list) + public SynchronizedReadOnlyCollection (object syncRoot, params T [] list) + : this (syncRoot, (IEnumerable) list) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs index 9e66babb71..5d942eebb2 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs @@ -176,7 +176,7 @@ namespace System.ServiceModel.Channels public virtual IChannelListener BuildChannelListener ( - Uri listenUri, + Uri listenUriBaseAddress, params object [] parameters) where TChannel : class, IChannel { @@ -184,16 +184,16 @@ namespace System.ServiceModel.Channels new BindingParameterCollection (); foreach (object o in parameters) pl.Add (o); - return BuildChannelListener (listenUri, pl); + return BuildChannelListener (listenUriBaseAddress, pl); } public virtual IChannelListener BuildChannelListener ( - Uri listenUri, + Uri listenUriBaseAddress, BindingParameterCollection parameters) where TChannel : class, IChannel { - return BuildChannelListener (listenUri, + return BuildChannelListener (listenUriBaseAddress, String.Empty, parameters); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs index be4ff59937..7c2936e07a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs @@ -197,16 +197,16 @@ namespace System.ServiceModel.Channels } public IAsyncResult BeginAcceptChannel ( - AsyncCallback callback, object asyncState) + AsyncCallback callback, object state) { return BeginAcceptChannel ( - timeouts.ReceiveTimeout, callback, asyncState); + timeouts.ReceiveTimeout, callback, state); } public IAsyncResult BeginAcceptChannel (TimeSpan timeout, - AsyncCallback callback, object asyncState) + AsyncCallback callback, object state) { - return OnBeginAcceptChannel (timeout, callback, asyncState); + return OnBeginAcceptChannel (timeout, callback, state); } public TChannel EndAcceptChannel (IAsyncResult result) @@ -217,7 +217,7 @@ namespace System.ServiceModel.Channels protected abstract TChannel OnAcceptChannel (TimeSpan timeout); protected abstract IAsyncResult OnBeginAcceptChannel (TimeSpan timeout, - AsyncCallback callback, object asyncState); + AsyncCallback callback, object state); protected abstract TChannel OnEndAcceptChannel (IAsyncResult result); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs index feb1f9ae77..c1630966b0 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs @@ -43,8 +43,8 @@ namespace System.ServiceModel.Channels ISecurityCapabilities security; string scheme = ""; - public CustomBinding (string name) - : this (name, default_ns) + public CustomBinding (string configurationName) + : this (configurationName, default_ns) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs index 1b6be5ad60..a5e5b39ec6 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs @@ -334,19 +334,19 @@ namespace System.ServiceModel.Channels // 1) public static Message CreateMessage (MessageVersion version, - FaultCode code, string reason, string action) + FaultCode faultCode, string reason, string action) { - MessageFault fault = MessageFault.CreateFault (code, reason); + MessageFault fault = MessageFault.CreateFault (faultCode, reason); return CreateMessage (version, fault, action); } // 2) public static Message CreateMessage (MessageVersion version, - FaultCode code, string reason, object detail, + FaultCode faultCode, string reason, object detail, string action) { MessageFault fault = MessageFault.CreateFault ( - code, new FaultReason (reason), detail); + faultCode, new FaultReason (reason), detail); return CreateMessage (version, fault, action); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs index ecbf261c31..1bb8186155 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs @@ -47,9 +47,9 @@ namespace System.ServiceModel.Channels { return CreateNavigator (XmlSpace.Default); } - public XPathNavigator CreateNavigator (int node_quota) + public XPathNavigator CreateNavigator (int nodeQuota) { - return CreateNavigator (node_quota, XmlSpace.Default); + return CreateNavigator (nodeQuota, XmlSpace.Default); } [MonoTODO ("supply proper quota")] @@ -60,10 +60,10 @@ namespace System.ServiceModel.Channels { } [MonoTODO ("Handle node_quota and xmlspace")] - public XPathNavigator CreateNavigator (int node_quota, XmlSpace space) + public XPathNavigator CreateNavigator (int nodeQuota, XmlSpace space) { if (nav_cache == null) { - DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), node_quota); + DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), nodeQuota); XmlDictionaryWriter w = XmlDictionaryWriter.CreateDictionaryWriter (pw); CreateMessage ().WriteMessage (w); nav_cache = pw.CreateDocument ().CreateNavigator (); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs index 8527e5c313..6e3675e95a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs @@ -220,26 +220,26 @@ namespace System.ServiceModel.Channels public static MessageFault CreateFault (FaultCode code, FaultReason reason, object detail, - XmlObjectSerializer formatter) + XmlObjectSerializer serializer) { return new SimpleMessageFault (code, reason, true, - detail, formatter, String.Empty, String.Empty); + detail, serializer, String.Empty, String.Empty); } public static MessageFault CreateFault (FaultCode code, FaultReason reason, object detail, - XmlObjectSerializer formatter, string actor) + XmlObjectSerializer serializer, string actor) { return new SimpleMessageFault (code, reason, - true, detail, formatter, actor, String.Empty); + true, detail, serializer, actor, String.Empty); } public static MessageFault CreateFault (FaultCode code, FaultReason reason, object detail, - XmlObjectSerializer formatter, string actor, string node) + XmlObjectSerializer serializer, string actor, string node) { return new SimpleMessageFault (code, reason, - true, detail, formatter, actor, node); + true, detail, serializer, actor, node); } // pretty simple implementation class diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs index c08ef8697d..3ee4ef203d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs @@ -50,10 +50,10 @@ namespace System.ServiceModel.Channels new Dictionary (); MessageVersion version; - public MessageHeaders (MessageHeaders headers) - : this (headers.MessageVersion) + public MessageHeaders (MessageHeaders collection) + : this (collection.MessageVersion) { - CopyHeadersFrom (headers); + CopyHeadersFrom (collection); } public MessageHeaders (MessageVersion version) @@ -61,10 +61,10 @@ namespace System.ServiceModel.Channels { } - public MessageHeaders (MessageVersion version, int capacity) + public MessageHeaders (MessageVersion version, int initialSize) { this.version = version; - l = new List (capacity); + l = new List (initialSize); } public void Add (MessageHeader header) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs index 2b43d40adf..5faeb48c50 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs @@ -49,10 +49,10 @@ namespace System.ServiceModel.Channels } public MtomMessageEncodingBindingElement ( - MessageVersion version, Encoding encoding) + MessageVersion messageVersion, Encoding writeEncoding) { - this.version = version; - this.encoding = encoding; + this.version = messageVersion; + this.encoding = writeEncoding; } public int MaxBufferSize { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs index 759bafd5b1..674d6cef46 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs @@ -41,10 +41,10 @@ namespace System.ServiceModel.Channels } protected NamedPipeTransportBindingElement ( - NamedPipeTransportBindingElement other) - : base (other) + NamedPipeTransportBindingElement elementToBeCloned) + : base (elementToBeCloned) { - pool.CopyPropertiesFrom (other.pool); + pool.CopyPropertiesFrom (elementToBeCloned.pool); } NamedPipeConnectionPoolSettings pool = new NamedPipeConnectionPoolSettings (); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs index 0a5fa43897..f6b58f582a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs @@ -37,7 +37,7 @@ namespace System.ServiceModel.Channels { } - protected StreamUpgradeBindingElement (StreamUpgradeBindingElement other) + protected StreamUpgradeBindingElement (StreamUpgradeBindingElement elementToBeCloned) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs index dee266e465..07356fb418 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs @@ -45,9 +45,9 @@ namespace System.ServiceModel.Channels { } - public TransactionFlowBindingElement (TransactionProtocol protocol) + public TransactionFlowBindingElement (TransactionProtocol transactionProtocol) { - this.protocol = protocol; + this.protocol = transactionProtocol; } public TransactionProtocol TransactionProtocol { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs index cea035495e..92f746e223 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs @@ -40,14 +40,14 @@ namespace System.ServiceModel.Channels { headers = new List (); } - public void Add (MessageHeaderInfo header) + public void Add (MessageHeaderInfo headerInfo) { - headers.Add (header); + headers.Add (headerInfo); } - public bool Contains (MessageHeaderInfo header) + public bool Contains (MessageHeaderInfo headerInfo) { - return headers.Contains (header); + return headers.Contains (headerInfo); } public IEnumerator GetEnumerator () @@ -55,9 +55,9 @@ namespace System.ServiceModel.Channels return headers.GetEnumerator (); } - public void Remove (MessageHeaderInfo header) + public void Remove (MessageHeaderInfo headerInfo) { - headers.Remove (header); + headers.Remove (headerInfo); } IEnumerator IEnumerable.GetEnumerator () diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs index a83fffc8b2..a69522b599 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs @@ -111,9 +111,9 @@ namespace System.ServiceModel.Configuration return new BinaryMessageEncodingBindingElement (); } - public override void ApplyConfiguration (BindingElement element) + public override void ApplyConfiguration (BindingElement bindingElement) { - var b = (BinaryMessageEncodingBindingElement) element; + var b = (BinaryMessageEncodingBindingElement) bindingElement; b.MaxReadPoolSize = MaxReadPoolSize; b.MaxSessionSize = MaxSessionSize; b.MaxWritePoolSize = MaxWritePoolSize; @@ -121,9 +121,9 @@ namespace System.ServiceModel.Configuration ReaderQuotas.ApplyConfiguration (b.ReaderQuotas); } - public override void CopyFrom (ServiceModelExtensionElement element) + public override void CopyFrom (ServiceModelExtensionElement from) { - var b = (BinaryMessageEncodingElement) element; + var b = (BinaryMessageEncodingElement) from; MaxReadPoolSize = b.MaxReadPoolSize; MaxSessionSize = b.MaxSessionSize; MaxWritePoolSize = b.MaxWritePoolSize; @@ -131,9 +131,9 @@ namespace System.ServiceModel.Configuration ReaderQuotas.CopyFrom (b.ReaderQuotas); } - protected internal override void InitializeFrom (BindingElement element) + protected internal override void InitializeFrom (BindingElement bindingElement) { - var b = (BinaryMessageEncodingBindingElement) element; + var b = (BinaryMessageEncodingBindingElement) bindingElement; MaxReadPoolSize = b.MaxReadPoolSize; MaxSessionSize = b.MaxSessionSize; MaxWritePoolSize = b.MaxWritePoolSize; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs index 1b17fc25e3..8d08464197 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs @@ -165,12 +165,12 @@ namespace System.ServiceModel.Configuration return sm.Bindings; } - public new BindingCollectionElement this [string name] { + public new BindingCollectionElement this [string binding] { get { - object element = base [name]; + object element = base [binding]; if (element is BindingCollectionElement) return (BindingCollectionElement) element; - throw new NotImplementedException (String.Format ("Could not find {0}", name)); + throw new NotImplementedException (String.Format ("Could not find {0}", binding)); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs index 9b1300e425..b2460ce48a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs @@ -147,21 +147,21 @@ namespace System.ServiceModel.Configuration return cb; } - protected internal void ApplyConfiguration (ClientCredentials cb) + protected internal void ApplyConfiguration (ClientCredentials behavior) { - cb.SupportInteractive = SupportInteractive; + behavior.SupportInteractive = SupportInteractive; // how is "Type" used? // ClientCertificate if (!String.IsNullOrEmpty (ClientCertificate.FindValue)) - cb.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue); + behavior.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue); // HttpDigest if (HttpDigest.ImpersonationLevel != TokenImpersonationLevel.None) throw new NotImplementedException (); // IssuedToken - var bi = cb.IssuedToken; + var bi = behavior.IssuedToken; var ci = IssuedToken; bi.CacheIssuedTokens = ci.CacheIssuedTokens; bi.DefaultKeyEntropyMode = ci.DefaultKeyEntropyMode; @@ -174,19 +174,19 @@ namespace System.ServiceModel.Configuration // Peer if (!String.IsNullOrEmpty (Peer.Certificate.FindValue)) - cb.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue); + behavior.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue); // cb.Peer.MeshPassword = /* cannot fill it here */ - cb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType); - cb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode; - cb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode; - cb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation; - cb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType); - cb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode; - cb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode; - cb.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation; + behavior.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType); + behavior.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode; + behavior.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode; + behavior.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation; + behavior.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType); + behavior.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode; + behavior.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode; + behavior.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation; // ServiceCertificate - var bsc = cb.ServiceCertificate; + var bsc = behavior.ServiceCertificate; var csc = ServiceCertificate; var bsca = bsc.Authentication; var csca = csc.Authentication; @@ -202,8 +202,8 @@ namespace System.ServiceModel.Configuration // cb.UserNamePassword : not configurable ... // Windows - cb.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel; - cb.Windows.AllowNtlm = Windows.AllowNtlm; + behavior.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel; + behavior.Windows.AllowNtlm = Windows.AllowNtlm; } object CreateInstance (string typeName) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs index 41220685f8..ff1c144135 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs @@ -150,9 +150,9 @@ namespace System.ServiceModel.Configuration return new ReliableSessionBindingElement (); } - public override void ApplyConfiguration (BindingElement element) + public override void ApplyConfiguration (BindingElement bindingElement) { - var b = (ReliableSessionBindingElement) element; + var b = (ReliableSessionBindingElement) bindingElement; b.AcknowledgementInterval = AcknowledgementInterval; b.FlowControlEnabled = FlowControlEnabled; b.InactivityTimeout = InactivityTimeout; @@ -163,9 +163,9 @@ namespace System.ServiceModel.Configuration b.ReliableMessagingVersion = ReliableMessagingVersion; } - public override void CopyFrom (ServiceModelExtensionElement element) + public override void CopyFrom (ServiceModelExtensionElement from) { - var b = (ReliableSessionElement) element; + var b = (ReliableSessionElement) from; AcknowledgementInterval = b.AcknowledgementInterval; FlowControlEnabled = b.FlowControlEnabled; InactivityTimeout = b.InactivityTimeout; @@ -176,9 +176,9 @@ namespace System.ServiceModel.Configuration ReliableMessagingVersion = b.ReliableMessagingVersion; } - protected internal override void InitializeFrom (BindingElement element) + protected internal override void InitializeFrom (BindingElement bindingElement) { - var b = (ReliableSessionBindingElement) element; + var b = (ReliableSessionBindingElement) bindingElement; AcknowledgementInterval = b.AcknowledgementInterval; FlowControlEnabled = b.FlowControlEnabled; InactivityTimeout = b.InactivityTimeout; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs index 9830a57ce6..498103508c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs @@ -132,57 +132,57 @@ namespace System.ServiceModel.Configuration return sb; } - protected internal void ApplyConfiguration (ServiceCredentials sb) + protected internal void ApplyConfiguration (ServiceCredentials behavior) { // IssuedToken foreach (AllowedAudienceUriElement ae in IssuedTokenAuthentication.AllowedAudienceUris) - sb.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri); - sb.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers; - sb.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode; + behavior.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri); + behavior.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers; + behavior.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode; if (!String.IsNullOrEmpty (IssuedTokenAuthentication.CustomCertificateValidatorType)) - sb.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType); - sb.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode; - sb.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode; - sb.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation; + behavior.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType); + behavior.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode; + behavior.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode; + behavior.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation; foreach (X509CertificateTrustedIssuerElement ce in IssuedTokenAuthentication.KnownCertificates) - sb.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue)); + behavior.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue)); - sb.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType); + behavior.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType); // Peer if (!String.IsNullOrEmpty (Peer.Certificate.FindValue)) - sb.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue); + behavior.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue); // sb.Peer.MeshPassword = /* cannot fill it here */ - sb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType); - sb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode; - sb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode; - sb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation; - sb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType); - sb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode; - sb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode; - sb.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation; + behavior.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType); + behavior.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode; + behavior.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode; + behavior.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation; + behavior.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType); + behavior.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode; + behavior.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode; + behavior.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation; // WSSC - sb.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType); + behavior.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType); // X509 if (!String.IsNullOrEmpty (ServiceCertificate.FindValue)) - sb.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue); + behavior.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue); // UserNamePassword - sb.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime; - sb.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens; - sb.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType); - sb.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups; - sb.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens; - sb.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName); - sb.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode; + behavior.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime; + behavior.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens; + behavior.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType); + behavior.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups; + behavior.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens; + behavior.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName); + behavior.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode; // Windows - sb.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons; - sb.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups; + behavior.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons; + behavior.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups; } X509Certificate2 GetCertificate (StoreLocation storeLocation, StoreName storeName, X509FindType findType, object findValue) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs index 6de08d8d90..4dfa45e011 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs @@ -94,19 +94,19 @@ namespace System.ServiceModel.Configuration return (ConfigurationElement) Activator.CreateInstance (typeof (ConfigurationElementType), new object [0]); } - public void CopyTo (ConfigurationElementType [] array, int index) + public void CopyTo (ConfigurationElementType [] array, int start) { - base.CopyTo (array, index); + base.CopyTo (array, start); } - public int IndexOf (ConfigurationElementType item) + public int IndexOf (ConfigurationElementType element) { - return BaseIndexOf (item); + return BaseIndexOf (element); } - public void Remove (ConfigurationElementType item) + public void Remove (ConfigurationElementType element) { - BaseRemove (GetElementKey (item)); + BaseRemove (GetElementKey (element)); } public void RemoveAt (int index) @@ -114,9 +114,9 @@ namespace System.ServiceModel.Configuration BaseRemoveAt (index); } - public void RemoveAt (object index) + public void RemoveAt (object key) { - BaseRemove (index); + BaseRemove (key); } } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs index 45b4b753ba..a2bf4f649e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs @@ -92,10 +92,10 @@ namespace System.ServiceModel.Configuration // Methods - public void ApplyConfiguration (OptionalReliableSession s) + public void ApplyConfiguration (OptionalReliableSession optionalReliableSession) { - base.ApplyConfiguration (s); - s.Enabled = this.Enabled; + base.ApplyConfiguration (optionalReliableSession); + optionalReliableSession.Enabled = this.Enabled; } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs index 08d4aaa59a..6a06b7375b 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs @@ -115,10 +115,10 @@ namespace System.ServiceModel.Configuration // Methods - public void ApplyConfiguration (ReliableSession s) + public void ApplyConfiguration (ReliableSession reliableSession) { - s.InactivityTimeout = InactivityTimeout; - s.Ordered = Ordered; + reliableSession.InactivityTimeout = InactivityTimeout; + reliableSession.Ordered = Ordered; } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs index 559481da6b..fe3a6ff115 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs @@ -114,11 +114,11 @@ namespace System.ServiceModel.Configuration protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ChannelEndpointElement channelEndpointElement); - protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement channelEndpointElement); + protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement serviceEndpointElement); protected abstract void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement); - protected abstract void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement); + protected abstract void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement); protected override void Reset (ConfigurationElement parentElement) { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs index 2a82a49ac5..aa38ecda1a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs @@ -109,12 +109,12 @@ namespace System.ServiceModel.Configuration return sm.StandardEndpoints; } - public new EndpointCollectionElement this [string name] { + public new EndpointCollectionElement this [string endpoint] { get { - object element = base [name]; + object element = base [endpoint]; if (element is EndpointCollectionElement) return (EndpointCollectionElement) element; - throw new ArgumentException (String.Format ("Could not find {0}", name)); + throw new ArgumentException (String.Format ("Could not find {0}", endpoint)); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs index 56cfdc76f5..2aa626e618 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs @@ -124,9 +124,9 @@ namespace System.ServiceModel.Configuration } - public override void ApplyConfiguration (BindingElement element) + public override void ApplyConfiguration (BindingElement bindingElement) { - var b = (TextMessageEncodingBindingElement) element; + var b = (TextMessageEncodingBindingElement) bindingElement; b.MaxReadPoolSize = MaxReadPoolSize; b.MaxWritePoolSize = MaxWritePoolSize; b.MessageVersion = MessageVersion; @@ -135,9 +135,9 @@ namespace System.ServiceModel.Configuration ReaderQuotas.ApplyConfiguration (b.ReaderQuotas); } - public override void CopyFrom (ServiceModelExtensionElement element) + public override void CopyFrom (ServiceModelExtensionElement from) { - var b = (TextMessageEncodingElement) element; + var b = (TextMessageEncodingElement) from; MaxReadPoolSize = b.MaxReadPoolSize; MaxWritePoolSize = b.MaxWritePoolSize; MessageVersion = b.MessageVersion; @@ -146,9 +146,9 @@ namespace System.ServiceModel.Configuration ReaderQuotas.CopyFrom (b.ReaderQuotas); } - protected internal override void InitializeFrom (BindingElement element) + protected internal override void InitializeFrom (BindingElement bindingElement) { - var b = (TextMessageEncodingBindingElement) element; + var b = (TextMessageEncodingBindingElement) bindingElement; MaxReadPoolSize = b.MaxReadPoolSize; MaxWritePoolSize = b.MaxWritePoolSize; MessageVersion = b.MessageVersion; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs index b77c331a40..11f9991a60 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs @@ -40,20 +40,20 @@ namespace System.ServiceModel.Description { } - public FaultDescription Find (string name) + public FaultDescription Find (string action) { foreach (FaultDescription d in this) - if (d.Name == name) + if (d.Name == action) return d; return null; } - public Collection FindAll (string name) + public Collection FindAll (string action) { Collection ret = new Collection (); foreach (FaultDescription d in this) - if (d.Name == name) + if (d.Name == action) ret.Add (d); return ret; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs index 39103884b4..fb16e0a9a4 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs @@ -35,17 +35,17 @@ namespace System.ServiceModel.Description public interface IServiceBehavior { void AddBindingParameters ( - ServiceDescription description, + ServiceDescription serviceDescription, ServiceHostBase serviceHostBase, Collection endpoints, - BindingParameterCollection parameters); + BindingParameterCollection bindingParameters); void ApplyDispatchBehavior ( - ServiceDescription description, + ServiceDescription serviceDescription, ServiceHostBase serviceHostBase); void Validate ( - ServiceDescription description, + ServiceDescription serviceDescription, ServiceHostBase serviceHostBase); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs index 31374445b0..07a26129c5 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs @@ -41,9 +41,9 @@ namespace System.ServiceModel.Description XmlSchemaSet xmlSchemas, ICollection policy); void ImportContract (WsdlImporter importer, - WsdlContractConversionContext contractContext); + WsdlContractConversionContext context); void ImportEndpoint (WsdlImporter importer, - WsdlEndpointConversionContext endpointContext); + WsdlEndpointConversionContext context); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs index afa66b9429..91388a1559 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs @@ -57,9 +57,9 @@ namespace System.ServiceModel.Description get { return msg; } } - public override bool Equals (object other) + public override bool Equals (object obj) { - MetadataConversionError e = other as MetadataConversionError; + MetadataConversionError e = obj as MetadataConversionError; return e != null && e.warning == warning && e.msg == msg; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs index 274a2be62b..018250f4b9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs @@ -53,7 +53,7 @@ namespace System.ServiceModel.Description ServiceContractGenerationContext contract, OperationDescription operation, CodeTypeDeclaration declaringType, - CodeMemberMethod method, + CodeMemberMethod syncMethod, CodeMemberMethod beginMethod, CodeMemberMethod endMethod) { @@ -61,7 +61,7 @@ namespace System.ServiceModel.Description this.contract = contract; this.operation = operation; declaring_type = declaringType; - this.method = method; + this.method = syncMethod; this.begin_method = beginMethod; this.end_method = endMethod; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs index 60d03dc17c..3fb7105f04 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs @@ -41,45 +41,45 @@ namespace System.ServiceModel.Description { } - public PolicyAssertionCollection (IEnumerable list) - : base (new List (list)) + public PolicyAssertionCollection (IEnumerable elements) + : base (new List (elements)) { } [MonoTODO] - public bool Contains (string name, string ns) + public bool Contains (string localName, string namespaceUri) { foreach (XmlElement el in this) - if (el.LocalName == name && el.NamespaceURI == ns) + if (el.LocalName == localName && el.NamespaceURI == namespaceUri) return true; return false; } [MonoTODO] - public XmlElement Find (string name, string ns) + public XmlElement Find (string localName, string namespaceUri) { foreach (XmlElement el in this) - if (el.LocalName == name && el.NamespaceURI == ns) + if (el.LocalName == localName && el.NamespaceURI == namespaceUri) return el; return null; } [MonoTODO] - public Collection FindAll (string name, string ns) + public Collection FindAll (string localName, string namespaceUri) { Collection ret = new Collection (); foreach (XmlElement el in this) - if (el.LocalName == name && el.NamespaceURI == ns) + if (el.LocalName == localName && el.NamespaceURI == namespaceUri) ret.Add (el); return ret; } [MonoTODO] - public XmlElement Remove (string name, string ns) + public XmlElement Remove (string localName, string namespaceUri) { foreach (XmlElement el in this) - if (el.LocalName == name && el.NamespaceURI == ns) { + if (el.LocalName == localName && el.NamespaceURI == namespaceUri) { Remove (el); return el; } @@ -87,9 +87,9 @@ namespace System.ServiceModel.Description } [MonoTODO] - public Collection RemoveAll (string name, string ns) + public Collection RemoveAll (string localName, string namespaceUri) { - Collection list = FindAll (name, ns); + Collection list = FindAll (localName, namespaceUri); foreach (XmlElement el in list) Remove (el); return list; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs index 59f0aa2ce7..8590c4538c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs @@ -111,23 +111,23 @@ namespace System.ServiceModel.Description { } - public ServiceContractGenerator (CodeCompileUnit ccu) - : this (ccu, null) + public ServiceContractGenerator (CodeCompileUnit targetCompileUnit) + : this (targetCompileUnit, null) { } - public ServiceContractGenerator (ConfigurationType config) - : this (null, config) + public ServiceContractGenerator (ConfigurationType targetConfig) + : this (null, targetConfig) { } - public ServiceContractGenerator (CodeCompileUnit ccu, ConfigurationType config) + public ServiceContractGenerator (CodeCompileUnit targetCompileUnit, ConfigurationType targetConfig) { - if (ccu == null) + if (targetCompileUnit == null) this.ccu = new CodeCompileUnit (); else - this.ccu = ccu; - this.config = config; + this.ccu = targetCompileUnit; + this.config = targetConfig; Options |= ServiceContractGenerationOptions.ChannelInterface | ServiceContractGenerationOptions.ClientClass; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs index 4235e393b8..5b6caccb2c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs @@ -81,30 +81,30 @@ namespace System.ServiceModel.Description set { service_type = value; } } - public static ServiceDescription GetService (Type type) + public static ServiceDescription GetService (Type serviceType) { // null Type is not rejected ServiceDescription sd = new ServiceDescription (); - sd.ServiceType = type; - if (type != null) { - var att = type.GetCustomAttribute (true); + sd.ServiceType = serviceType; + if (serviceType != null) { + var att = serviceType.GetCustomAttribute (true); if (att != null) { sd.Name = att.Name; sd.Namespace = att.Namespace; } if (sd.Name == null) - sd.Name = type.Name; + sd.Name = serviceType.Name; if (sd.Namespace == null) sd.Namespace = "http://tempuri.org/"; } return sd; } - public static ServiceDescription GetService (object wellKnown) + public static ServiceDescription GetService (object serviceImplementation) { // null instance is not rejected ServiceDescription sd = new ServiceDescription (); - sd.ServiceType = wellKnown != null ? wellKnown.GetType () : null; + sd.ServiceType = serviceImplementation != null ? serviceImplementation.GetType () : null; return sd; } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs index 191d411ed4..6641e62b4d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs @@ -38,27 +38,27 @@ namespace System.ServiceModel.Description { } - public ServiceEndpoint Find (Type type) + public ServiceEndpoint Find (Type contractType) { foreach (ServiceEndpoint e in this) - if (e.Contract.ContractType == type) + if (e.Contract.ContractType == contractType) return e; return null; } - public ServiceEndpoint Find (Uri uri) + public ServiceEndpoint Find (Uri address) { foreach (ServiceEndpoint e in this) - if (e.Address.Uri == uri) + if (e.Address.Uri == address) return e; return null; } - public ServiceEndpoint Find (XmlQualifiedName name) + public ServiceEndpoint Find (XmlQualifiedName contractName) { foreach (ServiceEndpoint e in this) - if (e.Contract.Name == name.Name && - e.Contract.Namespace == name.Namespace) + if (e.Contract.Name == contractName.Name && + e.Contract.Namespace == contractName.Namespace) return e; return null; } @@ -96,13 +96,13 @@ namespace System.ServiceModel.Description return list; } - public Collection FindAll (XmlQualifiedName name) + public Collection FindAll (XmlQualifiedName contractName) { Collection list = new Collection (); foreach (ServiceEndpoint e in this) - if (e.Contract.Name == name.Name && - e.Contract.Namespace == name.Namespace) + if (e.Contract.Name == contractName.Name && + e.Contract.Namespace == contractName.Namespace) list.Add (e); return list; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs index 153f3713d2..aff8033dac 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs @@ -73,50 +73,50 @@ namespace System.ServiceModel.Description } public static TypedMessageConverter Create ( - Type type, string action) + Type messageContract, string action) { - return Create (type, action, TempUri); + return Create (messageContract, action, TempUri); } public static TypedMessageConverter Create ( - Type type, string action, + Type messageContract, string action, string defaultNamespace) { - return Create (type, action, defaultNamespace, (DataContractFormatAttribute)null); + return Create (messageContract, action, defaultNamespace, (DataContractFormatAttribute)null); } public static TypedMessageConverter Create ( - Type type, string action, + Type messageContract, string action, DataContractFormatAttribute formatterAttribute) { - return Create (type, action, TempUri, formatterAttribute); + return Create (messageContract, action, TempUri, formatterAttribute); } public static TypedMessageConverter Create ( - Type type, + Type messageContract, string action, string defaultNamespace, DataContractFormatAttribute formatterAttribute) { return new DefaultTypedMessageConverter ( new DataContractMessagesFormatter ( - MessageContractToMessagesDescription (type, defaultNamespace, action), + MessageContractToMessagesDescription (messageContract, defaultNamespace, action), formatterAttribute)); } public static TypedMessageConverter Create ( - Type type, string action, + Type messageContract, string action, XmlSerializerFormatAttribute formatterAttribute) { - return Create (type, action, TempUri, formatterAttribute); + return Create (messageContract, action, TempUri, formatterAttribute); } public static TypedMessageConverter Create ( - Type type, string action, string defaultNamespace, + Type messageContract, string action, string defaultNamespace, XmlSerializerFormatAttribute formatterAttribute) { return new DefaultTypedMessageConverter ( new XmlMessagesFormatter ( - MessageContractToMessagesDescription (type, defaultNamespace, action), + MessageContractToMessagesDescription (messageContract, defaultNamespace, action), formatterAttribute)); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs index da253dd1e9..b604d64c8e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs @@ -76,7 +76,7 @@ namespace System.ServiceModel.Description } public MessageDescription GetMessageDescription ( - MessageBinding message) + MessageBinding messageBinding) { throw new NotImplementedException (); } @@ -88,7 +88,7 @@ namespace System.ServiceModel.Description } public OperationDescription GetOperationDescription ( - OperationBinding operation) + OperationBinding operationBinding) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs index be5e051ff4..a1ceff8010 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs @@ -441,12 +441,12 @@ namespace System.ServiceModel.Description public void ExportEndpoints ( IEnumerable endpoints, - XmlQualifiedName name) + XmlQualifiedName wsdlServiceQName) { if (endpoints == null) throw new ArgumentNullException ("endpoints"); - if (name == null) - throw new ArgumentNullException ("name"); + if (wsdlServiceQName == null) + throw new ArgumentNullException ("wsdlServiceQName"); foreach (ServiceEndpoint ep in endpoints) { if (ep.Contract.Name == ServiceMetadataBehavior.MexContractName) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs index 562e02b25d..dd95be31d5 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs @@ -153,9 +153,9 @@ namespace System.ServiceModel.Description beforeImportCalled = true; } - public SMBinding ImportBinding (WSBinding binding) + public SMBinding ImportBinding (WSBinding wsdlBinding) { - return ImportBinding (binding, true).Binding; + return ImportBinding (wsdlBinding, true).Binding; } ServiceEndpoint ImportBinding (WSBinding binding, bool throwOnError) @@ -546,20 +546,20 @@ namespace System.ServiceModel.Description } } - public ServiceEndpointCollection ImportEndpoints (WSBinding binding) + public ServiceEndpointCollection ImportEndpoints (WSBinding wsdlBinding) { var coll = new ServiceEndpointCollection (); - ImportEndpoints (coll, binding); + ImportEndpoints (coll, wsdlBinding); return coll; } - public ServiceEndpointCollection ImportEndpoints (PortType portType) + public ServiceEndpointCollection ImportEndpoints (PortType wsdlPortType) { var coll = new ServiceEndpointCollection (); foreach (WSServiceDescription wsd in wsdl_documents) { foreach (WS.Binding binding in wsd.Bindings) { - if (!binding.Type.Name.Equals (portType.Name)) + if (!binding.Type.Name.Equals (wsdlPortType.Name)) continue; ImportEndpoints (coll, binding); @@ -569,11 +569,11 @@ namespace System.ServiceModel.Description return coll; } - public ServiceEndpointCollection ImportEndpoints (Service service) + public ServiceEndpointCollection ImportEndpoints (Service wsdlService) { var coll = new ServiceEndpointCollection (); - foreach (Port port in service.Ports) { + foreach (Port port in wsdlService.Ports) { var sep = ImportEndpoint (port, false); if (sep != null) coll.Add (sep); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs index 26ee9d753d..6a43f3510e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs @@ -51,13 +51,13 @@ namespace System.ServiceModel.Description public XmlSerializerOperationBehavior ( OperationDescription operation, - XmlSerializerFormatAttribute format) + XmlSerializerFormatAttribute attribute) { if (operation == null) throw new ArgumentNullException ("operation"); - if (format == null) - format = new XmlSerializerFormatAttribute (); - this.format = format; + if (attribute == null) + attribute = new XmlSerializerFormatAttribute (); + this.format = attribute; this.operation = operation; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs index 07ecb269b3..7143952367 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs @@ -70,10 +70,10 @@ namespace System.ServiceModel.Dispatcher { return false; } - public override bool Match (MessageBuffer buffer) + public override bool Match (MessageBuffer messageBuffer) { bool retval; - Message m = buffer.CreateMessage (); + Message m = messageBuffer.CreateMessage (); retval = Match (m); m.Close (); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs index ed5cdd8428..72133244ba 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs @@ -65,6 +65,6 @@ namespace System.ServiceModel.Dispatcher { set { transport_handler = value; } } - public abstract bool HandleException (Exception e); + public abstract bool HandleException (Exception exception); } } \ No newline at end of file diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs index faa7b6c077..9479897fb0 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs @@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher Collection filters; public FilterInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {} - public FilterInvalidBodyAccessException (string msg) : base (msg) {} - public FilterInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {} + public FilterInvalidBodyAccessException (string message) : base (message) {} + public FilterInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {} protected FilterInvalidBodyAccessException (SerializationInfo info, StreamingContext context) : base (info, context) {} - public FilterInvalidBodyAccessException (string msg, Collection filters) - : base (msg) + public FilterInvalidBodyAccessException (string message, Collection filters) + : base (message) { this.filters = filters; } - public FilterInvalidBodyAccessException (string msg, Exception inner, Collection filters) - : base (msg, inner) + public FilterInvalidBodyAccessException (string message, Exception innerException, Collection filters) + : base (message, innerException) { this.filters = filters; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs index ca367777b1..b00e94f042 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs @@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher public interface IDispatchMessageFormatter { void DeserializeRequest (Message message, object [] parameters); - Message SerializeReply (MessageVersion version, object [] parameters, object result); + Message SerializeReply (MessageVersion messageVersion, object [] parameters, object result); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs index b9c278cf08..a8fcaac45e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs @@ -32,8 +32,8 @@ namespace System.ServiceModel.Dispatcher { public interface IDispatchMessageInspector { - object AfterReceiveRequest (ref Message message, - IClientChannel channel, InstanceContext context); - void BeforeSendReply (ref Message message, object instance); + object AfterReceiveRequest (ref Message request, + IClientChannel channel, InstanceContext instanceContext); + void BeforeSendReply (ref Message reply, object correlationState); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs index 04441f0795..49357ef568 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs @@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher { public interface IDispatchOperationSelector { - string SelectOperation (ref Message msg); + string SelectOperation (ref Message message); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs index f9b2f101b1..9f5e99a609 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs @@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher { public interface IErrorHandler { - bool HandleError (Exception exception); - void ProvideFault (Exception exception, MessageVersion version, + bool HandleError (Exception error); + void ProvideFault (Exception error, MessageVersion version, ref Message fault); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs index d3887da877..3d26c75c09 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs @@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher { public interface IInstanceContextInitializer { - void Initialize (InstanceContext context, Message message); + void Initialize (InstanceContext instanceContext, Message message); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs index eb93926827..22ba41ccfb 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs @@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher { public interface IInstanceProvider { - object GetInstance (InstanceContext context); - object GetInstance (InstanceContext context, Message message); - void ReleaseInstance (InstanceContext context, object instance); + object GetInstance (InstanceContext instanceContext); + object GetInstance (InstanceContext instanceContext, Message message); + void ReleaseInstance (InstanceContext instanceContext, object instance); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs index 5e185ac55b..6e5967ab65 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs @@ -40,16 +40,16 @@ namespace System.ServiceModel.Dispatcher IEnumerable>, IEnumerable { - bool GetMatchingFilter (Message message, out MessageFilter result); - bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result); + bool GetMatchingFilter (Message message, out MessageFilter filter); + bool GetMatchingFilter (MessageBuffer messageBuffer, out MessageFilter filter); bool GetMatchingFilters (Message message, ICollection results); - bool GetMatchingFilters (MessageBuffer buffer, ICollection results); + bool GetMatchingFilters (MessageBuffer messageBuffer, ICollection results); - bool GetMatchingValue (Message message, out TFilterData data); - bool GetMatchingValue (MessageBuffer buffer, out TFilterData data); + bool GetMatchingValue (Message message, out TFilterData value); + bool GetMatchingValue (MessageBuffer messageBuffer, out TFilterData value); bool GetMatchingValues (Message message, ICollection results); - bool GetMatchingValues (MessageBuffer buffer, ICollection results); + bool GetMatchingValues (MessageBuffer messageBuffer, ICollection results); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs index 9d46d2743b..ad6a5194a1 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs @@ -1,4 +1,4 @@ -// +// // InstanceContextIdleCallback.cs // // Author: Atsushi Enomoto (atsushi@ximian.com) @@ -28,5 +28,5 @@ using System; namespace System.ServiceModel.Dispatcher { - public delegate void InstanceContextIdleCallback (InstanceContext context); + public delegate void InstanceContextIdleCallback (InstanceContext instanceContext); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs index 2c34c3cd67..7474906c6d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel.Dispatcher [Serializable] public abstract class InvalidBodyAccessException : SystemException { - protected InvalidBodyAccessException (string msg) : base (msg) {} - protected InvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {} + protected InvalidBodyAccessException (string message) : base (message) {} + protected InvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {} protected InvalidBodyAccessException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs index 4f0aa6be5e..5b9de5e2f4 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs @@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher return true; } - public override bool Match (MessageBuffer buffer) + public override bool Match (MessageBuffer messageBuffer) { // as documented return true; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs index 3272144385..d0fe3aef86 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs @@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher return false; } - public override bool Match (MessageBuffer buffer) + public override bool Match (MessageBuffer messageBuffer) { // as documented return false; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs index 50b526a913..5801ca3891 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs @@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher Collection filters; public MessageFilterException () : this ("MessageFilter node quota exceeded.") {} - public MessageFilterException (string msg) : base (msg) {} - public MessageFilterException (string msg, Exception inner) : base (msg, inner) {} + public MessageFilterException (string message) : base (message) {} + public MessageFilterException (string message, Exception innerException) : base (message, innerException) {} protected MessageFilterException (SerializationInfo info, StreamingContext context) : base (info, context) {} - public MessageFilterException (string msg, Collection filters) - : base (msg) + public MessageFilterException (string message, Collection filters) + : base (message) { this.filters = filters; } - public MessageFilterException (string msg, Exception inner, Collection filters) - : base (msg, inner) + public MessageFilterException (string message, Exception innerException, Collection filters) + : base (message, innerException) { this.filters = filters; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs index b0f4021300..e93fb8be4f 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs @@ -46,9 +46,9 @@ namespace System.ServiceModel.Dispatcher public MessageFilterTable () : this (0) {} // 0 is the default - public MessageFilterTable (int default_priority) + public MessageFilterTable (int defaultPriority) { - this.default_priority = default_priority; + this.default_priority = defaultPriority; table = new Dictionary (); priority_list = new Dictionary (); } @@ -85,9 +85,9 @@ namespace System.ServiceModel.Dispatcher return table.ContainsKey (filter); } - public void CopyTo (KeyValuePair [] array, int index) + public void CopyTo (KeyValuePair [] array, int arrayIndex) { - ((ICollection) table).CopyTo (array, index); + ((ICollection) table).CopyTo (array, arrayIndex); } protected virtual IMessageFilterTable CreateFilterTable (MessageFilter filter) @@ -105,11 +105,11 @@ namespace System.ServiceModel.Dispatcher return priority_list [filter]; } - public bool GetMatchingFilter (Message message, out MessageFilter result) + public bool GetMatchingFilter (Message message, out MessageFilter filter) { if (message == null) throw new ArgumentNullException ("message is null"); - result = null; + filter = null; int count = 0; foreach (MessageFilter f in table.Keys) { @@ -121,14 +121,14 @@ namespace System.ServiceModel.Dispatcher "More than one filter matches."); count++; - result = f; + filter = f; } return count == 1; } - public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result) + public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter filter) { - return GetMatchingFilter (buffer.CreateMessage (), out result); + return GetMatchingFilter (buffer.CreateMessage (), out filter); } [MonoTODO ("Consider priority")] diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs index b33c0fdca2..9f8caadeb9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs @@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher Collection filters; public MultipleFilterMatchesException () : base () {} - public MultipleFilterMatchesException (string msg) : base (msg) {} - public MultipleFilterMatchesException (string msg, Exception inner) : base (msg, inner) {} + public MultipleFilterMatchesException (string message) : base (message) {} + public MultipleFilterMatchesException (string message, Exception innerException) : base (message, innerException) {} protected MultipleFilterMatchesException (SerializationInfo info, StreamingContext context) : base (info, context) {} - public MultipleFilterMatchesException (string msg, Collection filters) - : base (msg) + public MultipleFilterMatchesException (string message, Collection filters) + : base (message) { this.filters = filters; } - public MultipleFilterMatchesException (string msg, Exception inner, Collection filters) - : base (msg, inner) + public MultipleFilterMatchesException (string message, Exception innerException, Collection filters) + : base (message, innerException) { this.filters = filters; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs index 08d3b19f6b..595110a87c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel.Dispatcher public class NavigatorInvalidBodyAccessException : InvalidBodyAccessException { public NavigatorInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {} - public NavigatorInvalidBodyAccessException (string msg) : base (msg) {} - public NavigatorInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {} + public NavigatorInvalidBodyAccessException (string message) : base (message) {} + public NavigatorInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {} protected NavigatorInvalidBodyAccessException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs index cac0bf9111..a4f8f2c721 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs @@ -36,12 +36,12 @@ namespace System.ServiceModel.Dispatcher { protected SeekableXPathNavigator () {} - public abstract XmlNodeOrder ComparePosition (long first, long second); - public abstract string GetLocalName (long node_position); - public abstract string GetName (long node_position); - public abstract string GetNamespace (long node_position); - public abstract XPathNodeType GetNodeType (long node_position); - public abstract string GetValue (long node_position); + public abstract XmlNodeOrder ComparePosition (long firstPosition, long secondPosition); + public abstract string GetLocalName (long nodePosition); + public abstract string GetName (long nodePosition); + public abstract string GetNamespace (long nodePosition); + public abstract XPathNodeType GetNodeType (long nodePosition); + public abstract string GetValue (long nodePosition); public abstract long CurrentPosition { get; set; } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs index 3bef60dc7c..302facfca8 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs @@ -41,8 +41,8 @@ namespace System.ServiceModel.Dispatcher { } - public XPathMessageContext (NameTable nameTable) - : base (nameTable) + public XPathMessageContext (NameTable table) + : base (table) { AddNamespace ("s11", Constants.Soap11); AddNamespace ("s12", Constants.Soap12); @@ -52,9 +52,9 @@ namespace System.ServiceModel.Dispatcher get { return false; } // as documented. } - public override int CompareDocument (string uri1, string uri2) + public override int CompareDocument (string baseUri, string nextBaseUri) { - return String.CompareOrdinal (uri1, uri2); + return String.CompareOrdinal (baseUri, nextBaseUri); } public override bool PreserveWhitespace (XPathNavigator node) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs index 17a612b62a..658a5d1ed0 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs @@ -68,9 +68,9 @@ namespace System.ServiceModel.Dispatcher Initialize (xpath, namespaces); } - public XPathMessageFilter (string xpath, XsltContext namespaces) + public XPathMessageFilter (string xpath, XsltContext context) { - Initialize (xpath, namespaces); + Initialize (xpath, context); } [MonoTODO] @@ -86,9 +86,9 @@ namespace System.ServiceModel.Dispatcher } [MonoTODO] - public XPathMessageFilter (XmlReader reader, XsltContext namespaces) + public XPathMessageFilter (XmlReader reader, XsltContext context) { - Initialize (reader.ReadString (), namespaces); + Initialize (reader.ReadString (), context); } private void Initialize (string xpath, XmlNamespaceManager nsmgr) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs index 71d7536fd3..f0c72f5de8 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs @@ -55,9 +55,9 @@ namespace System.ServiceModel.Dispatcher { } - public XPathMessageFilterTable (int quota) + public XPathMessageFilterTable (int capacity) { - this.quota = quota; + this.quota = capacity; } [DataMember] @@ -66,9 +66,9 @@ namespace System.ServiceModel.Dispatcher set { quota = value; } } - public TFilterData this [MessageFilter key] { - get { return dict [key]; } - set { dict [key] = value; } + public TFilterData this [MessageFilter filter] { + get { return dict [filter]; } + set { dict [filter] = value; } } public int Count { @@ -114,17 +114,17 @@ namespace System.ServiceModel.Dispatcher dict [item.Key].Equals (item.Value); } - public bool ContainsKey (MessageFilter key) + public bool ContainsKey (MessageFilter filter) { - return dict.ContainsKey (key); + return dict.ContainsKey (filter); } - public void CopyTo (KeyValuePair [] array, int index) + public void CopyTo (KeyValuePair [] array, int arrayIndex) { - if (index < 0 || dict.Count >= array.Length - index) - throw new ArgumentOutOfRangeException ("index"); + if (arrayIndex < 0 || dict.Count >= array.Length - arrayIndex) + throw new ArgumentOutOfRangeException ("arrayIndex"); foreach (KeyValuePair item in dict) - array [index++] = item; + array [arrayIndex++] = item; } public IEnumerator> GetEnumerator () @@ -137,12 +137,12 @@ namespace System.ServiceModel.Dispatcher return GetEnumerator (); } - public bool GetMatchingFilter (Message message, out MessageFilter result) + public bool GetMatchingFilter (Message message, out MessageFilter filter) { throw new NotImplementedException (); } - public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result) + public bool GetMatchingFilter (MessageBuffer messageBuffer, out MessageFilter filter) { throw new NotImplementedException (); } @@ -162,7 +162,7 @@ namespace System.ServiceModel.Dispatcher throw new NotImplementedException (); } - public bool GetMatchingFilters (MessageBuffer buffer, ICollection results) + public bool GetMatchingFilters (MessageBuffer messageBuffer, ICollection results) { throw new NotImplementedException (); } @@ -182,7 +182,7 @@ namespace System.ServiceModel.Dispatcher throw new NotImplementedException (); } - public bool GetMatchingValue (MessageBuffer buffer, out TFilterData data) + public bool GetMatchingValue (MessageBuffer messageBuffer, out TFilterData data) { throw new NotImplementedException (); } @@ -202,7 +202,7 @@ namespace System.ServiceModel.Dispatcher throw new NotImplementedException (); } - public bool GetMatchingValues (MessageBuffer buffer, ICollection results) + public bool GetMatchingValues (MessageBuffer messageBuffer, ICollection results) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs index 365a7be5bf..b3cd66a6a3 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs @@ -36,9 +36,9 @@ namespace System.ServiceModel.Dispatcher public class XPathNavigatorException : XPathException { public XPathNavigatorException () : this ("Navigator node quota exceeded") {} - public XPathNavigatorException (string msg) : base (msg) {} - public XPathNavigatorException (string msg, Exception inner) - : base (msg, inner) {} + public XPathNavigatorException (string message) : base (message) {} + public XPathNavigatorException (string message, Exception innerException) + : base (message, innerException) {} protected XPathNavigatorException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs b/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs index 654f855033..a060cf0f5a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs @@ -29,10 +29,10 @@ namespace System.ServiceModel.PeerResolvers { } - public UnregisterInfo (string meshId, Guid registration_id) + public UnregisterInfo (string meshId, Guid registrationId) { Body.MeshId = meshId; - Body.RegistrationId = registration_id; + Body.RegistrationId = registrationId; } public string MeshId { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs index a865639e0b..762e5876ba 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs @@ -61,17 +61,17 @@ namespace System.ServiceModel.Security.Tokens binding = issuerBinding; } - protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters source) - : base (source) + protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters other) + : base (other) { - binding = source.binding; - issuer_address = source.issuer_address; - issuer_meta_address = source.issuer_meta_address; - key_size = source.key_size; - key_type = source.key_type; - token_type = source.token_type; - reqs = new Collection (source.reqs); - additional_reqs = new Collection (source.additional_reqs); + binding = other.binding; + issuer_address = other.issuer_address; + issuer_meta_address = other.issuer_meta_address; + key_size = other.key_size; + key_type = other.key_type; + token_type = other.token_type; + reqs = new Collection (other.reqs); + additional_reqs = new Collection (other.additional_reqs); } Binding binding; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs index 37a82c0123..9d6a5f0797 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs @@ -37,8 +37,8 @@ namespace System.ServiceModel.Security.Tokens { } - protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters source) - : base (source) + protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters other) + : base (other) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs index f0dcdee2cf..02e2a7818b 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs @@ -39,8 +39,8 @@ namespace System.ServiceModel.Security.Tokens RequireDerivedKeys = true; } - protected RsaSecurityTokenParameters (RsaSecurityTokenParameters source) - : base (source) + protected RsaSecurityTokenParameters (RsaSecurityTokenParameters other) + : base (other) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs index 41a1376f05..16ea4653b1 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs @@ -111,11 +111,11 @@ namespace System.ServiceModel.Security.Tokens } #endif - protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters source) - : base (source) + protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters other) + : base (other) { - this.element = (SecurityBindingElement) source.element.Clone (); - this.cancellable = source.cancellable; + this.element = (SecurityBindingElement) other.element.Clone (); + this.cancellable = other.cancellable; #if !MOBILE && !XAMMAC_4_5 this.requirements = new ChannelProtectionRequirements (default_channel_protection_requirements); #endif diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs index 846d8358f5..3bff55ef9d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs @@ -200,10 +200,10 @@ namespace System.ServiceModel.Security.Tokens throw new NotSupportedException (String.Format ("X509SecurityToken does not support creation of {0}.", t)); } - public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause clause) + public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause keyIdentifierClause) { SecurityContextKeyIdentifierClause sctic = - clause as SecurityContextKeyIdentifierClause; + keyIdentifierClause as SecurityContextKeyIdentifierClause; return sctic != null && sctic.ContextId == ContextId && sctic.Generation == KeyGeneration; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs index 92bbf9d37f..9eb21fd621 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs @@ -52,11 +52,11 @@ namespace System.ServiceModel.Security.Tokens this.cancel = requireCancellation; } - protected SslSecurityTokenParameters (SslSecurityTokenParameters source) - : base (source) + protected SslSecurityTokenParameters (SslSecurityTokenParameters other) + : base (other) { - cert = source.cert; - cancel = source.cancel; + cert = other.cert; + cancel = other.cancel; } bool cert, cancel; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs index be273ce27e..72e2cb0a92 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs @@ -44,7 +44,7 @@ namespace System.ServiceModel.Security.Tokens bool extract_groups, allow_unauth; [MonoTODO] - public SspiSecurityToken (NetworkCredential cred, + public SspiSecurityToken (NetworkCredential networkCredential, bool extractGroupsForWindowsAccounts, bool allowUnauthenticatedCallers) { @@ -54,7 +54,7 @@ namespace System.ServiceModel.Security.Tokens [MonoTODO] public SspiSecurityToken ( TokenImpersonationLevel impersonationLevel, - bool allowNtlm, NetworkCredential cred) + bool allowNtlm, NetworkCredential networkCredential) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs index 16cf529e43..1efbf1f1cd 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs @@ -47,10 +47,10 @@ namespace System.ServiceModel.Security.Tokens this.cancel = requireCancellation; } - protected SspiSecurityTokenParameters (SspiSecurityTokenParameters source) - : base (source) + protected SspiSecurityTokenParameters (SspiSecurityTokenParameters other) + : base (other) { - this.cancel = source.cancel; + this.cancel = other.cancel; } public bool RequireCancellation { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs index 46f1436065..c69d8bb2c9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs @@ -40,8 +40,8 @@ namespace System.ServiceModel.Security.Tokens RequireDerivedKeys = false; } - protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters source) - : base (source) + protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters other) + : base (other) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs index c02dfd4434..2d2aa06d56 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs @@ -51,10 +51,10 @@ namespace System.ServiceModel.Security.Tokens InclusionMode = inclusionMode; } - protected X509SecurityTokenParameters (X509SecurityTokenParameters source) - : base (source) + protected X509SecurityTokenParameters (X509SecurityTokenParameters other) + : base (other) { - reference_style = source.reference_style; + reference_style = other.reference_style; } public X509KeyIdentifierClauseType X509ReferenceStyle { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs index 17695f1ec2..7e30915cd6 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs @@ -95,14 +95,14 @@ namespace System.ServiceModel.Security header_types = new ReadOnlyCollection (header_types); } - public void Union (MessagePartSpecification other) + public void Union (MessagePartSpecification specification) { - if (other == null) - throw new ArgumentNullException ("other"); + if (specification == null) + throw new ArgumentNullException ("specification"); if (header_types.IsReadOnly) throw new InvalidOperationException ("This MessagePartSpecification is read-only."); - body |= other.body; - foreach (XmlQualifiedName q in other.header_types) + body |= specification.body; + foreach (XmlQualifiedName q in specification.header_types) // Sigh. It could be much better here. //if (!header_types.Contains (q)) header_types.Add (q); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs index d788a5a0b2..b747dee7c9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs @@ -1,4 +1,4 @@ -// +// // ServiceCredentialsSecurityTokenManager.cs // // Author: @@ -44,9 +44,9 @@ namespace System.ServiceModel.Security ServiceCredentials credentials; public ServiceCredentialsSecurityTokenManager ( - ServiceCredentials credentials) + ServiceCredentials parent) { - this.credentials = credentials; + this.credentials = parent; } public ServiceCredentials ServiceCredentials { @@ -55,35 +55,35 @@ namespace System.ServiceModel.Security [MonoTODO] public virtual EndpointIdentity GetIdentityOfSelf ( - SecurityTokenRequirement requirement) + SecurityTokenRequirement tokenRequirement) { throw new NotImplementedException (); } [MonoTODO] public override SecurityTokenAuthenticator CreateSecurityTokenAuthenticator ( - SecurityTokenRequirement requirement, + SecurityTokenRequirement tokenRequirement, out SecurityTokenResolver outOfBandTokenResolver) { outOfBandTokenResolver = null; - if (requirement.TokenType == SecurityTokenTypes.UserName) - return CreateUserNameAuthenticator (requirement); - if (requirement.TokenType == SecurityTokenTypes.X509Certificate) - return CreateX509Authenticator (requirement); - if (requirement.TokenType == SecurityTokenTypes.Rsa) + if (tokenRequirement.TokenType == SecurityTokenTypes.UserName) + return CreateUserNameAuthenticator (tokenRequirement); + if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate) + return CreateX509Authenticator (tokenRequirement); + if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa) return new RsaSecurityTokenAuthenticator (); - if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) { + if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) { SecurityBindingElement binding; - if (!requirement.TryGetProperty (ReqType.SecurityBindingElementProperty, out binding)) + if (!tokenRequirement.TryGetProperty (ReqType.SecurityBindingElementProperty, out binding)) throw new ArgumentException ("SecurityBindingElement is required in the security token requirement"); SecureConversationSecurityTokenParameters issuedParams; - if (!requirement.TryGetProperty (ReqType.IssuedSecurityTokenParametersProperty, out issuedParams)) + if (!tokenRequirement.TryGetProperty (ReqType.IssuedSecurityTokenParametersProperty, out issuedParams)) throw new ArgumentException ("IssuedSecurityTokenParameters are required in the security token requirement"); BindingContext issuerBC; - if (!requirement.TryGetProperty (ReqType.IssuerBindingContextProperty, out issuerBC)) + if (!tokenRequirement.TryGetProperty (ReqType.IssuerBindingContextProperty, out issuerBC)) throw new ArgumentException ("IssuerBindingContext is required in the security token requirement"); SecurityTokenVersion secVer; - if (!requirement.TryGetProperty (ReqType.MessageSecurityVersionProperty, out secVer)) + if (!tokenRequirement.TryGetProperty (ReqType.MessageSecurityVersionProperty, out secVer)) throw new ArgumentException ("MessageSecurityVersion property (of type SecurityTokenVersion) is required in the security token requirement"); // FIXME: get parameters from somewhere @@ -92,16 +92,16 @@ namespace System.ServiceModel.Security outOfBandTokenResolver = resolver; SecurityContextSecurityTokenAuthenticator sc = new SecurityContextSecurityTokenAuthenticator (); - return new SecureConversationSecurityTokenAuthenticator (requirement, sc, resolver); + return new SecureConversationSecurityTokenAuthenticator (tokenRequirement, sc, resolver); } - if (requirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) - return CreateSslTokenAuthenticator (requirement); - if (requirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) - return CreateSslTokenAuthenticator (requirement); - if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) - return CreateSpnegoTokenAuthenticator (requirement); + if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) + return CreateSslTokenAuthenticator (tokenRequirement); + if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) + return CreateSslTokenAuthenticator (tokenRequirement); + if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) + return CreateSpnegoTokenAuthenticator (tokenRequirement); else - throw new NotImplementedException ("Not implemented token type: " + requirement.TokenType); + throw new NotImplementedException ("Not implemented token type: " + tokenRequirement.TokenType); } SpnegoSecurityTokenAuthenticator CreateSpnegoTokenAuthenticator (SecurityTokenRequirement requirement) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs index 026daa9a82..f690f32e86 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs @@ -239,7 +239,7 @@ namespace System.ServiceModel.Security [MonoTODO] public virtual SecurityKeyIdentifierClause CreateKeyIdentifierClauseFromTokenXml ( - XmlElement tokenXml, SecurityTokenReferenceStyle referenceStyle) + XmlElement element, SecurityTokenReferenceStyle tokenReferenceStyle) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs index ac3b605cf9..0801770d6e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel { public class AddressAccessDeniedException : CommunicationException { public AddressAccessDeniedException () : base () {} - public AddressAccessDeniedException (string msg) : base (msg) {} - public AddressAccessDeniedException (string msg, Exception inner) : base (msg, inner) {} + public AddressAccessDeniedException (string message) : base (message) {} + public AddressAccessDeniedException (string message, Exception innerException) : base (message, innerException) {} protected AddressAccessDeniedException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs index 70103060fb..33e238146f 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel { public class AddressAlreadyInUseException : CommunicationException { public AddressAlreadyInUseException () : base () {} - public AddressAlreadyInUseException (string msg) : base (msg) {} - public AddressAlreadyInUseException (string msg, Exception inner) : base (msg, inner) {} + public AddressAlreadyInUseException (string message) : base (message) {} + public AddressAlreadyInUseException (string message, Exception innerException) : base (message, innerException) {} protected AddressAlreadyInUseException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs index 84b8f96db8..d4d00e768c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs @@ -299,11 +299,11 @@ namespace System.ServiceModel protected void InitializeEndpoint ( string configurationName, - EndpointAddress remoteAddress) + EndpointAddress address) { InitializeEndpoint (CreateDescription ()); - if (remoteAddress != null) - service_endpoint.Address = remoteAddress; + if (address != null) + service_endpoint.Address = address; ApplyConfiguration (configurationName); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs index 0f6560c743..25277d302b 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs @@ -125,14 +125,14 @@ namespace System.ServiceModel return ch; } - public static TChannel CreateChannel (Binding binding, EndpointAddress address) + public static TChannel CreateChannel (Binding binding, EndpointAddress endpointAddress) { - return CreateChannelCore (new ChannelFactory (binding, address), f => f.CreateChannel ()); + return CreateChannelCore (new ChannelFactory (binding, endpointAddress), f => f.CreateChannel ()); } - public static TChannel CreateChannel (Binding binding, EndpointAddress address, Uri via) + public static TChannel CreateChannel (Binding binding, EndpointAddress endpointAddress, Uri via) { - return CreateChannelCore (new ChannelFactory (binding), f => f.CreateChannel (address, via)); + return CreateChannelCore (new ChannelFactory (binding), f => f.CreateChannel (endpointAddress, via)); } public virtual TChannel CreateChannel (EndpointAddress address, Uri via) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs index 012b9b141e..2a5c04c74e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel public class ChannelTerminatedException : CommunicationException { public ChannelTerminatedException () : base () {} - public ChannelTerminatedException (string msg) : base (msg) {} - public ChannelTerminatedException (string msg, Exception inner) : base (msg, inner) {} + public ChannelTerminatedException (string message) : base (message) {} + public ChannelTerminatedException (string message, Exception innerException) : base (message, innerException) {} protected ChannelTerminatedException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs index 09f72793c2..54d4067b3a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs @@ -75,58 +75,58 @@ namespace System.ServiceModel { } - protected ClientBase (InstanceContext instance) - : this (instance, "*") + protected ClientBase (InstanceContext callbackInstance) + : this (callbackInstance, "*") { } - protected ClientBase (InstanceContext instance, string endpointConfigurationName) + protected ClientBase (InstanceContext callbackInstance, string endpointConfigurationName) { - if (instance == null) + if (callbackInstance == null) throw new ArgumentNullException ("instanceContext"); if (endpointConfigurationName == null) throw new ArgumentNullException ("endpointConfigurationName"); - Initialize (instance, endpointConfigurationName, null); + Initialize (callbackInstance, endpointConfigurationName, null); } - protected ClientBase (InstanceContext instance, + protected ClientBase (InstanceContext callbackInstance, string endpointConfigurationName, EndpointAddress remoteAddress) { - if (instance == null) + if (callbackInstance == null) throw new ArgumentNullException ("instanceContext"); if (endpointConfigurationName == null) throw new ArgumentNullException ("endpointConfigurationName"); if (remoteAddress == null) throw new ArgumentNullException ("remoteAddress"); - Initialize (instance, endpointConfigurationName, remoteAddress); + Initialize (callbackInstance, endpointConfigurationName, remoteAddress); } - protected ClientBase (InstanceContext instance, + protected ClientBase (InstanceContext callbackInstance, string endpointConfigurationName, string remoteAddress) { - if (instance == null) + if (callbackInstance == null) throw new ArgumentNullException ("instanceContext"); if (remoteAddress == null) throw new ArgumentNullException ("endpointAddress"); if (endpointConfigurationName == null) throw new ArgumentNullException ("endpointConfigurationName"); - Initialize (instance, endpointConfigurationName, new EndpointAddress (remoteAddress)); + Initialize (callbackInstance, endpointConfigurationName, new EndpointAddress (remoteAddress)); } - protected ClientBase (InstanceContext instance, + protected ClientBase (InstanceContext callbackInstance, Binding binding, EndpointAddress remoteAddress) { - if (instance == null) + if (callbackInstance == null) throw new ArgumentNullException ("instanceContext"); if (binding == null) throw new ArgumentNullException ("binding"); if (remoteAddress == null) throw new ArgumentNullException ("remoteAddress"); - Initialize (instance, binding, remoteAddress); + Initialize (callbackInstance, binding, remoteAddress); } protected ClientBase (ServiceEndpoint endpoint) @@ -134,8 +134,8 @@ namespace System.ServiceModel { } - protected ClientBase (InstanceContext instance, ServiceEndpoint endpoint) - : this (instance, new ChannelFactory (endpoint)) + protected ClientBase (InstanceContext callbackInstance, ServiceEndpoint endpoint) + : this (callbackInstance, new ChannelFactory (endpoint)) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs index af12296808..c19ad84413 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs @@ -1,4 +1,4 @@ -// +// // ClientCredentialsSecurityTokenManager.cs // // Author: @@ -45,11 +45,11 @@ namespace System.ServiceModel { ClientCredentials credentials; - public ClientCredentialsSecurityTokenManager (ClientCredentials credentials) + public ClientCredentialsSecurityTokenManager (ClientCredentials clientCredentials) { - if (credentials == null) - throw new ArgumentNullException ("credentials"); - this.credentials = credentials; + if (clientCredentials == null) + throw new ArgumentNullException ("clientCredentials"); + this.credentials = clientCredentials; } public ClientCredentials ClientCredentials { @@ -58,25 +58,25 @@ namespace System.ServiceModel [MonoTODO] public override SecurityTokenAuthenticator CreateSecurityTokenAuthenticator ( - SecurityTokenRequirement requirement, + SecurityTokenRequirement tokenRequirement, out SecurityTokenResolver outOfBandTokenResolver) { outOfBandTokenResolver = null; - if (requirement == null) - throw new ArgumentNullException ("requirement"); - if (requirement.TokenType == SecurityTokenTypes.UserName) { + if (tokenRequirement == null) + throw new ArgumentNullException ("tokenRequirement"); + if (tokenRequirement.TokenType == SecurityTokenTypes.UserName) { // unsupported } - else if (requirement.TokenType == SecurityTokenTypes.Rsa) + else if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa) return new RsaSecurityTokenAuthenticator (); - else if (requirement.TokenType == SecurityTokenTypes.X509Certificate) - return CreateX509Authenticator (requirement); - else if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) - return new SspiClientSecurityTokenAuthenticator (this, requirement); + else if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate) + return CreateX509Authenticator (tokenRequirement); + else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) + return new SspiClientSecurityTokenAuthenticator (this, tokenRequirement); else - throw new NotImplementedException ("Security token type " + requirement.TokenType); + throw new NotImplementedException ("Security token type " + tokenRequirement.TokenType); - throw new NotSupportedException (String.Format ("Security token requirement '{0}' is not supported to create SecurityTokenAuthenticator.", requirement)); + throw new NotSupportedException (String.Format ("Security token requirement '{0}' is not supported to create SecurityTokenAuthenticator.", tokenRequirement)); } @@ -102,40 +102,40 @@ namespace System.ServiceModel #region CreateSecurityTokenProvider() [MonoTODO] - public override SecurityTokenProvider CreateSecurityTokenProvider (SecurityTokenRequirement requirement) + public override SecurityTokenProvider CreateSecurityTokenProvider (SecurityTokenRequirement tokenRequirement) { - if (IsIssuedSecurityTokenRequirement (requirement)) - return CreateIssuedTokenProvider (requirement); + if (IsIssuedSecurityTokenRequirement (tokenRequirement)) + return CreateIssuedTokenProvider (tokenRequirement); bool isInitiator; // huh, they are not constants but properties. - if (requirement.TokenType == SecurityTokenTypes.X509Certificate) - return CreateX509SecurityTokenProvider (requirement); - else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) - return CreateSecureConversationProvider (requirement); - else if (requirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) { - if (requirement.TryGetProperty (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator) - return CreateSslnegoProvider (requirement); - } else if (requirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) { - if (requirement.TryGetProperty (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator) - return CreateSslnegoProvider (requirement); - } else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) { + if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate) + return CreateX509SecurityTokenProvider (tokenRequirement); + else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) + return CreateSecureConversationProvider (tokenRequirement); + else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) { + if (tokenRequirement.TryGetProperty (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator) + return CreateSslnegoProvider (tokenRequirement); + } else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) { + if (tokenRequirement.TryGetProperty (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator) + return CreateSslnegoProvider (tokenRequirement); + } else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) { // FIXME: implement - } else if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) { - return CreateSpnegoProvider (requirement); - } else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SspiCredential) { + } else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) { + return CreateSpnegoProvider (tokenRequirement); + } else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SspiCredential) { // FIXME: implement - } else if (requirement.TokenType == SecurityTokenTypes.Rsa) { + } else if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa) { // FIXME: implement - } else if (requirement.TokenType == SecurityTokenTypes.Saml) { + } else if (tokenRequirement.TokenType == SecurityTokenTypes.Saml) { // FIXME: implement - } else if (requirement.TokenType == SecurityTokenTypes.UserName) - return CreateUserNameProvider (requirement); - else if (requirement.TokenType == SecurityTokenTypes.Kerberos) { - return CreateKerberosProvider (requirement); + } else if (tokenRequirement.TokenType == SecurityTokenTypes.UserName) + return CreateUserNameProvider (tokenRequirement); + else if (tokenRequirement.TokenType == SecurityTokenTypes.Kerberos) { + return CreateKerberosProvider (tokenRequirement); } - throw new NotSupportedException (String.Format ("Token type '{0}' is not supported", requirement.TokenType)); + throw new NotSupportedException (String.Format ("Token type '{0}' is not supported", tokenRequirement.TokenType)); } UserNameSecurityTokenProvider CreateUserNameProvider ( diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs index 01336d803a..51d7685b53 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs @@ -93,47 +93,47 @@ namespace System.ServiceModel callback_instance_type = callbackInstanceType; } - public DuplexChannelFactory (object callbackInstance) - : this (new InstanceContext (callbackInstance)) + public DuplexChannelFactory (object callbackObject) + : this (new InstanceContext (callbackObject)) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, string endpointConfigurationName) - : this (new InstanceContext (callbackInstance), endpointConfigurationName) + : this (new InstanceContext (callbackObject), endpointConfigurationName) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, string endpointConfigurationName, EndpointAddress remoteAddress) - : this (new InstanceContext (callbackInstance), endpointConfigurationName, remoteAddress) + : this (new InstanceContext (callbackObject), endpointConfigurationName, remoteAddress) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, ServiceEndpoint endpoint) - : this (new InstanceContext (callbackInstance), endpoint) + : this (new InstanceContext (callbackObject), endpoint) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, Binding binding) - : this (new InstanceContext (callbackInstance), binding) + : this (new InstanceContext (callbackObject), binding) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, Binding binding, string remoteAddress) - : this (callbackInstance, binding, new EndpointAddress (remoteAddress)) + : this (callbackObject, binding, new EndpointAddress (remoteAddress)) { } - public DuplexChannelFactory (object callbackInstance, + public DuplexChannelFactory (object callbackObject, Binding binding, EndpointAddress remoteAddress) - : this (new InstanceContext (callbackInstance), binding, remoteAddress) + : this (new InstanceContext (callbackObject), binding, remoteAddress) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs index 64ce85812b..c51ce43a77 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs @@ -52,8 +52,8 @@ namespace System.ServiceModel } protected DuplexClientBase (object callbackInstance, - string bindingConfigurationName, EndpointAddress remoteAddress) - : this (new InstanceContext (callbackInstance), bindingConfigurationName, remoteAddress) + string endpointConfigurationName, EndpointAddress remoteAddress) + : this (new InstanceContext (callbackInstance), endpointConfigurationName, remoteAddress) { } @@ -87,8 +87,8 @@ namespace System.ServiceModel } protected DuplexClientBase (InstanceContext callbackInstance, - string endpointConfigurationName, EndpointAddress address) - : base (callbackInstance, endpointConfigurationName, address) + string endpointConfigurationName, EndpointAddress remoteAddress) + : base (callbackInstance, endpointConfigurationName, remoteAddress) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs index 1740e4d990..19e8a56ae7 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs @@ -406,19 +406,19 @@ namespace System.ServiceModel public void WriteTo ( AddressingVersion addressingVersion, XmlDictionaryWriter writer, - XmlDictionaryString localname, + XmlDictionaryString localName, XmlDictionaryString ns) { - writer.WriteStartElement (localname, ns); + writer.WriteStartElement (localName, ns); WriteContentsTo (addressingVersion, writer); writer.WriteEndElement (); } public void WriteTo ( AddressingVersion addressingVersion, - XmlWriter writer, string localname, string ns) + XmlWriter writer, string localName, string ns) { - writer.WriteStartElement (localname, ns); + writer.WriteStartElement (localName, ns); WriteContentsTo (addressingVersion, writer); writer.WriteEndElement (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs index 71ff2f0f13..9963d39615 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs @@ -110,9 +110,9 @@ namespace System.ServiceModel return new X509CertificateEndpointIdentity (primaryCertificate, supportingCertificates); } - public override bool Equals (object other) + public override bool Equals (object obj) { - EndpointIdentity e = other as EndpointIdentity; + EndpointIdentity e = obj as EndpointIdentity; return e != null && comparer.Equals (claim, e.claim); } @@ -126,19 +126,19 @@ namespace System.ServiceModel return String.Concat ("identity(", claim, ")"); } - protected void Initialize (Claim claim) + protected void Initialize (Claim identityClaim) { - Initialize (claim, Claim.DefaultComparer); + Initialize (identityClaim, Claim.DefaultComparer); } - protected void Initialize (Claim claim, IEqualityComparer comparer) + protected void Initialize (Claim identityClaim, IEqualityComparer claimComparer) { - if (claim == null) - throw new ArgumentNullException ("claim"); - if (comparer == null) - throw new ArgumentNullException ("comparer"); - this.claim = claim; - this.comparer = comparer; + if (identityClaim == null) + throw new ArgumentNullException ("identityClaim"); + if (claimComparer == null) + throw new ArgumentNullException ("claimComparer"); + this.claim = identityClaim; + this.comparer = claimComparer; } } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs index 05b3af01ca..1fdfa99acf 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs @@ -44,13 +44,13 @@ namespace System.ServiceModel { } - public FaultException (string msg) - : this (new FaultReason (msg)) + public FaultException (string reason) + : this (new FaultReason (reason)) { } - public FaultException (string msg, FaultCode code) - : this (new FaultReason (msg), code) + public FaultException (string reason, FaultCode code) + : this (new FaultReason (reason), code) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs index 223cd81753..f9970c33e4 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs @@ -36,9 +36,9 @@ namespace System.ServiceModel public class MsmqException : ExternalException { public MsmqException () : base () {} - public MsmqException (string msg) : base (msg) {} - public MsmqException (string msg, int win32ErrorCode) : base (msg, win32ErrorCode) {} - public MsmqException (string msg, Exception inner) : base (msg, inner) {} + public MsmqException (string message) : base (message) {} + public MsmqException (string message, int error) : base (message, error) {} + public MsmqException (string message, Exception inner) : base (message, inner) {} protected MsmqException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs index 57fc6fe287..120a5ad8a2 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel public class MsmqPoisonMessageException : PoisonMessageException { public MsmqPoisonMessageException () : base () {} - public MsmqPoisonMessageException (string msg) : base (msg) {} - public MsmqPoisonMessageException (string msg, Exception inner) : base (msg, inner) {} + public MsmqPoisonMessageException (string message) : base (message) {} + public MsmqPoisonMessageException (string message, Exception innerException) : base (message, innerException) {} protected MsmqPoisonMessageException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs b/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs index 3d8ebe30b8..9dd6a59691 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs @@ -1,4 +1,4 @@ -// +// // OptionalReliableSession.cs // // Author: @@ -42,11 +42,11 @@ namespace System.ServiceModel { } - public OptionalReliableSession (ReliableSessionBindingElement binding) - : base (binding) + public OptionalReliableSession (ReliableSessionBindingElement reliableSessionBindingElement) + : base (reliableSessionBindingElement) { - if (binding == null) - throw new ArgumentNullException ("binding"); + if (reliableSessionBindingElement == null) + throw new ArgumentNullException ("reliableSessionBindingElement"); } public bool Enabled { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs index 9d0fc743e6..99751678f4 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel public class PoisonMessageException : SystemException { public PoisonMessageException () : base () {} - public PoisonMessageException (string msg) : base (msg) {} - public PoisonMessageException (string msg, Exception inner) : base (msg, inner) {} + public PoisonMessageException (string message) : base (message) {} + public PoisonMessageException (string message, Exception innerException) : base (message, innerException) {} protected PoisonMessageException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs index 5a5a3509e6..243ae798b2 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs @@ -1,4 +1,4 @@ -// +// // ReliableSession.cs // // Author: @@ -39,12 +39,12 @@ namespace System.ServiceModel { } - public ReliableSession (ReliableSessionBindingElement binding) + public ReliableSession (ReliableSessionBindingElement reliableSessionBindingElement) { - if (binding == null) - throw new ArgumentNullException ("binding"); - InactivityTimeout = binding.InactivityTimeout; - Ordered = binding.Ordered; + if (reliableSessionBindingElement == null) + throw new ArgumentNullException ("reliableSessionBindingElement"); + InactivityTimeout = reliableSessionBindingElement.InactivityTimeout; + Ordered = reliableSessionBindingElement.Ordered; } public TimeSpan InactivityTimeout { get; set; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs index 1d0bf8fefc..caca3f0b84 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs @@ -49,11 +49,11 @@ namespace System.ServiceModel throw new NotImplementedException (); } - public RsaEndpointIdentity (X509Certificate2 cert) + public RsaEndpointIdentity (X509Certificate2 certificate) { - if (cert == null) - throw new ArgumentNullException ("cert"); - rsa = (RSA) cert.PublicKey.Key; + if (certificate == null) + throw new ArgumentNullException ("certificate"); + rsa = (RSA) certificate.PublicKey.Key; } } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs index 4a547c3ab8..14b5cec4aa 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs @@ -33,24 +33,24 @@ namespace System.ServiceModel { public class ServiceAuthorizationManager { - public virtual bool CheckAccess (OperationContext context) + public virtual bool CheckAccess (OperationContext operationContext) { - return CheckAccessCore (context); + return CheckAccessCore (operationContext); } - public virtual bool CheckAccess (OperationContext context, ref Message message) + public virtual bool CheckAccess (OperationContext operationContext, ref Message message) { - return CheckAccessCore (context); + return CheckAccessCore (operationContext); } [MonoTODO] - protected virtual bool CheckAccessCore (OperationContext context) + protected virtual bool CheckAccessCore (OperationContext operationContext) { return false; } [MonoTODO] - protected virtual ReadOnlyCollection GetAuthorizationPolicies (OperationContext context) + protected virtual ReadOnlyCollection GetAuthorizationPolicies (OperationContext operationContext) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs index e438c8f5b7..47c3bc2993 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs @@ -45,12 +45,12 @@ namespace System.ServiceModel { } - public ServiceHost (object serviceInstance, + public ServiceHost (object singletonInstance, params Uri [] baseAddresses) { - if (serviceInstance == null) - throw new ArgumentNullException ("serviceInstance"); - InitializeDescription (serviceInstance, + if (singletonInstance == null) + throw new ArgumentNullException ("singletonInstance"); + InitializeDescription (singletonInstance, new UriSchemeKeyedCollection (baseAddresses)); } @@ -165,10 +165,10 @@ namespace System.ServiceModel InitializeDescription (baseAddresses); } - protected void InitializeDescription (object serviceInstance, UriSchemeKeyedCollection baseAddresses) + protected void InitializeDescription (object singletonInstance, UriSchemeKeyedCollection baseAddresses) { - instance = serviceInstance; - InitializeDescription (serviceInstance.GetType (), baseAddresses); + instance = singletonInstance; + InitializeDescription (singletonInstance.GetType (), baseAddresses); } } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs index 29a3d4aba6..1a84cecc58 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs @@ -492,9 +492,9 @@ namespace System.ServiceModel throw new InvalidOperationException ("The ServiceHost must have at least one application endpoint (that does not include metadata exchange endpoint) defined by either configuration, behaviors or call to AddServiceEndpoint methods."); } - protected void LoadConfigurationSection (ServiceElement element) + protected void LoadConfigurationSection (ServiceElement serviceSection) { - ApplyServiceElement (element); + ApplyServiceElement (serviceSection); } protected override sealed void OnAbort () diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs index c2ea59f9a8..8430860cb7 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs @@ -35,24 +35,24 @@ namespace System.ServiceModel public class UriSchemeKeyedCollection : SynchronizedKeyedCollection { - public UriSchemeKeyedCollection (params Uri [] uris) + public UriSchemeKeyedCollection (params Uri [] addresses) : base (new object ()) { - if (uris == null) + if (addresses == null) /* FIXME: masterinfo says, param name should be baseAddresses */ - throw new ArgumentNullException ("uris"); + throw new ArgumentNullException ("addresses"); - for (int i = 0; i < uris.Length; i ++) { - if (!uris [i].IsAbsoluteUri) + for (int i = 0; i < addresses.Length; i ++) { + if (!addresses [i].IsAbsoluteUri) throw new ArgumentException ("Only an absolute URI can be used as a base address"); - if (Contains (uris [i].Scheme)) - throw new ArgumentException ("Collection already contains an address with scheme "+ uris [i].Scheme); - if (uris [i].Query != String.Empty) + if (Contains (addresses [i].Scheme)) + throw new ArgumentException ("Collection already contains an address with scheme "+ addresses [i].Scheme); + if (addresses [i].Query != String.Empty) throw new ArgumentException ("A base address cannot contain a query string."); - InsertItem (i, uris [i]); + InsertItem (i, addresses [i]); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs index c0b1564ff2..b0af17b06e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs @@ -1,4 +1,4 @@ -// +// // WS2007FederationHttpBinding.cs // // Author: @@ -52,8 +52,8 @@ namespace System.ServiceModel } [MonoTODO] - public WS2007FederationHttpBinding (string configurationName) - : base (configurationName) + public WS2007FederationHttpBinding (string configName) + : base (configName) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs index 4ac7a2ea48..0a5cfbc339 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs @@ -1,4 +1,4 @@ -// +// // WS2007HttpBinding.cs // // Author: @@ -40,19 +40,19 @@ namespace System.ServiceModel { } - public WS2007HttpBinding (SecurityMode mode) - : base (mode) + public WS2007HttpBinding (SecurityMode securityMode) + : base (securityMode) { } - public WS2007HttpBinding (SecurityMode mode, bool reliableSessionEnabled) - : base (mode, reliableSessionEnabled) + public WS2007HttpBinding (SecurityMode securityMode, bool reliableSessionEnabled) + : base (securityMode, reliableSessionEnabled) { } [MonoTODO] - public WS2007HttpBinding (string configurationName) - : base (configurationName) + public WS2007HttpBinding (string configName) + : base (configName) { } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs index cfc054ea7a..7fc121e8ad 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs @@ -61,7 +61,7 @@ namespace System.ServiceModel } [MonoTODO] - public WSFederationHttpBinding (string configurationName) + public WSFederationHttpBinding (string configName) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs index 0a56a6df1f..90a4849a6e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs @@ -1,4 +1,4 @@ -// +// // WSHttpBinding.cs // // Author: @@ -45,20 +45,20 @@ namespace System.ServiceModel { } - public WSHttpBinding (SecurityMode mode) - : this (mode, false) + public WSHttpBinding (SecurityMode securityMode) + : this (securityMode, false) { } - public WSHttpBinding (SecurityMode mode, + public WSHttpBinding (SecurityMode securityMode, bool reliableSessionEnabled) : base (reliableSessionEnabled) { - security = new WSHttpSecurity (mode); + security = new WSHttpSecurity (securityMode); } [MonoTODO] - public WSHttpBinding (string configurationName) + public WSHttpBinding (string configName) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs index 88845ed8a6..3b71fc19e7 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs @@ -40,12 +40,12 @@ namespace System.ServiceModel X509Certificate2 primary; X509Certificate2Collection supporting, all; - public X509CertificateEndpointIdentity (X509Certificate2 cert) + public X509CertificateEndpointIdentity (X509Certificate2 certificate) { - if (cert == null) - throw new ArgumentNullException ("cert"); - primary = cert; - Initialize (Claim.CreateThumbprintClaim (cert.GetCertHash ())); + if (certificate == null) + throw new ArgumentNullException ("certificate"); + primary = certificate; + Initialize (Claim.CreateThumbprintClaim (certificate.GetCertHash ())); } public X509CertificateEndpointIdentity ( diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs index cb78fe2be1..220ea7d193 100644 --- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs +++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs @@ -189,6 +189,7 @@ namespace MonoTests.System.ServiceModel } [Test] + [Category ("NotWorking")] // Fails randomly public void StreamedConnection () { var host = new ServiceHost (typeof (Foo)); diff --git a/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources index c614c10bea..64af3348dc 100644 --- a/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources +++ b/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources @@ -177,6 +177,7 @@ System.ServiceModel.Dispatcher/IParameterInspector.cs System.ServiceModel.Security/HttpDigestClientCredential.cs System.ServiceModel.Security/MessageSecurityException.cs System.ServiceModel.Security/SecurityAccessDeniedException.cs +System.ServiceModel.Security/SecurityNegotiationException.cs System.ServiceModel.Security/UserNamePasswordClientCredential.cs System.ServiceModel.Security/WindowsClientCredential.cs System.ServiceModel.Security/X509CertificateInitiatorClientCredential.cs diff --git a/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs b/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs index f6781dc923..f98f6fa6e1 100644 --- a/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs +++ b/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs @@ -41,26 +41,26 @@ namespace System.Transactions this.options = options; } - public IAsyncResult BeginCommit (AsyncCallback callback, - object user_defined_state) + public IAsyncResult BeginCommit (AsyncCallback asyncCallback, + object asyncState) { - this.callback = callback; - this.user_defined_state = user_defined_state; + this.callback = asyncCallback; + this.user_defined_state = asyncState; AsyncCallback cb = null; - if (callback != null) + if (asyncCallback != null) cb = new AsyncCallback (CommitCallback); asyncResult = BeginCommitInternal (cb); return this; } - public void EndCommit (IAsyncResult ar) + public void EndCommit (IAsyncResult asyncResult) { - if (ar != this) + if (asyncResult != this) throw new ArgumentException ("The IAsyncResult parameter must be the same parameter as returned by BeginCommit.", "asyncResult"); - EndCommitInternal (asyncResult); + EndCommitInternal (this.asyncResult); } private void CommitCallback (IAsyncResult ar) diff --git a/mcs/class/System.Transactions/System.Transactions/IDtcTransaction.cs b/mcs/class/System.Transactions/System.Transactions/IDtcTransaction.cs index 65d012779c..29a2ee7212 100644 --- a/mcs/class/System.Transactions/System.Transactions/IDtcTransaction.cs +++ b/mcs/class/System.Transactions/System.Transactions/IDtcTransaction.cs @@ -19,11 +19,11 @@ namespace System.Transactions [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)] public interface IDtcTransaction { - void Abort (IntPtr manager, int whatever, int whatever2); + void Abort (IntPtr reason, int retaining, int async); - void Commit (int whatever, int whatever2, int whatever3); + void Commit (int retaining, int commitType, int reserved); - void GetTransactionInfo (IntPtr whatever); + void GetTransactionInfo (IntPtr transactionInformation); } } diff --git a/mcs/class/System.Transactions/System.Transactions/IPromotableSinglePhaseNotification.cs b/mcs/class/System.Transactions/System.Transactions/IPromotableSinglePhaseNotification.cs index 4e01d02de6..9684e74298 100644 --- a/mcs/class/System.Transactions/System.Transactions/IPromotableSinglePhaseNotification.cs +++ b/mcs/class/System.Transactions/System.Transactions/IPromotableSinglePhaseNotification.cs @@ -14,9 +14,9 @@ namespace System.Transactions { void Initialize (); - void Rollback (SinglePhaseEnlistment enlistment); + void Rollback (SinglePhaseEnlistment singlePhaseEnlistment); - void SinglePhaseCommit (SinglePhaseEnlistment enlistment); + void SinglePhaseCommit (SinglePhaseEnlistment singlePhaseEnlistment); } } diff --git a/mcs/class/System.Transactions/System.Transactions/ISinglePhaseNotification.cs b/mcs/class/System.Transactions/System.Transactions/ISinglePhaseNotification.cs index e206193a4c..7d029fa0c7 100644 --- a/mcs/class/System.Transactions/System.Transactions/ISinglePhaseNotification.cs +++ b/mcs/class/System.Transactions/System.Transactions/ISinglePhaseNotification.cs @@ -13,7 +13,7 @@ namespace System.Transactions public interface ISinglePhaseNotification : IEnlistmentNotification { - void SinglePhaseCommit (SinglePhaseEnlistment enlistment); + void SinglePhaseCommit (SinglePhaseEnlistment singlePhaseEnlistment); } } diff --git a/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs b/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs index 766d637bbe..e662279f85 100644 --- a/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs +++ b/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs @@ -40,9 +40,9 @@ namespace System.Transactions } [MonoTODO] - public void ForceRollback (Exception ex) + public void ForceRollback (Exception e) { - tx.Rollback (ex, enlisted); + tx.Rollback (e, enlisted); /* See test RMFail2 */ ((ManualResetEvent) waitHandle).Set (); } diff --git a/mcs/class/System.Transactions/System.Transactions/SubordinateTransaction.cs b/mcs/class/System.Transactions/System.Transactions/SubordinateTransaction.cs index 198ab796d5..efb1c4007a 100644 --- a/mcs/class/System.Transactions/System.Transactions/SubordinateTransaction.cs +++ b/mcs/class/System.Transactions/System.Transactions/SubordinateTransaction.cs @@ -14,7 +14,7 @@ namespace System.Transactions [Serializable] public sealed class SubordinateTransaction : Transaction { - public SubordinateTransaction (IsolationLevel level, + public SubordinateTransaction (IsolationLevel isoLevel, ISimpleTransactionSuperior superior) { throw new NotImplementedException (); diff --git a/mcs/class/System.Transactions/System.Transactions/Transaction.cs b/mcs/class/System.Transactions/System.Transactions/Transaction.cs index 20c31072d9..33422d15f1 100644 --- a/mcs/class/System.Transactions/System.Transactions/Transaction.cs +++ b/mcs/class/System.Transactions/System.Transactions/Transaction.cs @@ -137,44 +137,44 @@ namespace System.Transactions [MonoTODO] public DependentTransaction DependentClone ( - DependentCloneOption option) + DependentCloneOption cloneOption) { DependentTransaction d = - new DependentTransaction (this, option); + new DependentTransaction (this, cloneOption); dependents.Add (d); return d; } [MonoTODO ("Only SinglePhase commit supported for durable resource managers.")] [PermissionSetAttribute (SecurityAction.LinkDemand)] - public Enlistment EnlistDurable (Guid manager, - IEnlistmentNotification notification, - EnlistmentOptions options) + public Enlistment EnlistDurable (Guid resourceManagerIdentifier, + IEnlistmentNotification enlistmentNotification, + EnlistmentOptions enlistmentOptions) { throw new NotImplementedException ("DTC unsupported, only SinglePhase commit supported for durable resource managers."); } [MonoTODO ("Only Local Transaction Manager supported. Cannot have more than 1 durable resource per transaction. Only EnlistmentOptions.None supported yet.")] [PermissionSetAttribute (SecurityAction.LinkDemand)] - public Enlistment EnlistDurable (Guid manager, - ISinglePhaseNotification notification, - EnlistmentOptions options) + public Enlistment EnlistDurable (Guid resourceManagerIdentifier, + ISinglePhaseNotification singlePhaseNotification, + EnlistmentOptions enlistmentOptions) { EnsureIncompleteCurrentScope (); if (pspe != null || Durables.Count > 0) throw new NotImplementedException ("DTC unsupported, multiple durable resource managers aren't supported."); - if (options != EnlistmentOptions.None) + if (enlistmentOptions != EnlistmentOptions.None) throw new NotImplementedException ("EnlistmentOptions other than None aren't supported"); - Durables.Add (notification); + Durables.Add (singlePhaseNotification); /* FIXME: Enlistment ?? */ return new Enlistment (); } public bool EnlistPromotableSinglePhase ( - IPromotableSinglePhaseNotification notification) + IPromotableSinglePhaseNotification promotableSinglePhaseNotification) { EnsureIncompleteCurrentScope (); @@ -183,7 +183,7 @@ namespace System.Transactions if (pspe != null || Durables.Count > 0) return false; - pspe = notification; + pspe = promotableSinglePhaseNotification; pspe.Initialize(); return true; @@ -211,19 +211,19 @@ namespace System.Transactions [MonoTODO ("EnlistmentOptions being ignored")] public Enlistment EnlistVolatile ( - IEnlistmentNotification notification, - EnlistmentOptions options) + IEnlistmentNotification enlistmentNotification, + EnlistmentOptions enlistmentOptions) { - return EnlistVolatileInternal (notification, options); + return EnlistVolatileInternal (enlistmentNotification, enlistmentOptions); } [MonoTODO ("EnlistmentOptions being ignored")] public Enlistment EnlistVolatile ( - ISinglePhaseNotification notification, - EnlistmentOptions options) + ISinglePhaseNotification singlePhaseNotification, + EnlistmentOptions enlistmentOptions) { /* FIXME: Anything extra reqd for this? */ - return EnlistVolatileInternal (notification, options); + return EnlistVolatileInternal (singlePhaseNotification, enlistmentOptions); } private Enlistment EnlistVolatileInternal ( @@ -287,10 +287,10 @@ namespace System.Transactions Rollback (null); } - public void Rollback (Exception ex) + public void Rollback (Exception e) { EnsureIncompleteCurrentScope (); - Rollback (ex, null); + Rollback (e, null); } internal void Rollback (Exception ex, object abortingEnlisted) diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionInterop.cs b/mcs/class/System.Transactions/System.Transactions/TransactionInterop.cs index a764cf6e09..2d0cf35bed 100644 --- a/mcs/class/System.Transactions/System.Transactions/TransactionInterop.cs +++ b/mcs/class/System.Transactions/System.Transactions/TransactionInterop.cs @@ -25,27 +25,27 @@ namespace System.Transactions [MonoTODO] public static byte [] GetExportCookie (Transaction transaction, - byte [] exportCookie) + byte [] whereabouts) { throw new NotImplementedException (); } [MonoTODO] public static Transaction GetTransactionFromDtcTransaction ( - IDtcTransaction dtc) + IDtcTransaction transactionNative) { throw new NotImplementedException (); } [MonoTODO] public static Transaction GetTransactionFromExportCookie ( - byte [] exportCookie) + byte [] cookie) { throw new NotImplementedException (); } [MonoTODO] - public static Transaction GetTransactionFromTransmitterPropagationToken (byte [] token) + public static Transaction GetTransactionFromTransmitterPropagationToken (byte [] propagationToken) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionManager.cs b/mcs/class/System.Transactions/System.Transactions/TransactionManager.cs index b0d90bc2ea..491f46f765 100644 --- a/mcs/class/System.Transactions/System.Transactions/TransactionManager.cs +++ b/mcs/class/System.Transactions/System.Transactions/TransactionManager.cs @@ -67,15 +67,15 @@ namespace System.Transactions } [MonoTODO ("Not implemented")] - public static void RecoveryComplete (Guid manager) + public static void RecoveryComplete (Guid resourceManagerIdentifier) { throw new NotImplementedException (); } [MonoTODO ("Not implemented")] - public static Enlistment Reenlist (Guid manager, - byte[] recoveryInfo, - IEnlistmentNotification notification) + public static Enlistment Reenlist (Guid resourceManagerIdentifier, + byte[] recoveryInformation, + IEnlistmentNotification enlistmentNotification) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs b/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs index a466cfb74c..03fbab0966 100644 --- a/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs +++ b/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs @@ -32,18 +32,18 @@ namespace System.Transactions set { timeout = value; } } - public static bool operator == (TransactionOptions o1, - TransactionOptions o2) + public static bool operator == (TransactionOptions x, + TransactionOptions y) { - return o1.level == o2.level && - o1.timeout == o2.timeout; + return x.level == y.level && + x.timeout == y.timeout; } - public static bool operator != (TransactionOptions o1, - TransactionOptions o2) + public static bool operator != (TransactionOptions x, + TransactionOptions y) { - return o1.level != o2.level || - o1.timeout != o2.timeout; + return x.level != y.level || + x.timeout != y.timeout; } public override bool Equals (object obj) diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs b/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs index ac57713b59..874ddde0d8 100644 --- a/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs +++ b/mcs/class/System.Transactions/System.Transactions/TransactionScope.cs @@ -39,39 +39,39 @@ namespace System.Transactions { } - public TransactionScope(TransactionScopeAsyncFlowOption asyncFlow) + public TransactionScope(TransactionScopeAsyncFlowOption asyncFlowOption) : this(TransactionScopeOption.Required, - TransactionManager.DefaultTimeout, asyncFlow) + TransactionManager.DefaultTimeout, asyncFlowOption) { } - public TransactionScope (Transaction transaction) - : this (transaction, TransactionManager.DefaultTimeout) + public TransactionScope (Transaction transactionToUse) + : this (transactionToUse, TransactionManager.DefaultTimeout) { } - public TransactionScope (Transaction transaction, - TimeSpan timeout) - : this (transaction, timeout, DTCOption.None) + public TransactionScope (Transaction transactionToUse, + TimeSpan scopeTimeout) + : this (transactionToUse, scopeTimeout, DTCOption.None) { } [MonoTODO ("EnterpriseServicesInteropOption not supported.")] - public TransactionScope (Transaction transaction, - TimeSpan timeout, DTCOption opt) + public TransactionScope (Transaction transactionToUse, + TimeSpan scopeTimeout, DTCOption interopOption) { Initialize (TransactionScopeOption.Required, - transaction, defaultOptions, opt, timeout, TransactionScopeAsyncFlowOption.Suppress); + transactionToUse, defaultOptions, interopOption, scopeTimeout, TransactionScopeAsyncFlowOption.Suppress); } - public TransactionScope (TransactionScopeOption option) - : this (option, TransactionManager.DefaultTimeout) + public TransactionScope (TransactionScopeOption scopeOption) + : this (scopeOption, TransactionManager.DefaultTimeout) { } - public TransactionScope (TransactionScopeOption option, - TimeSpan timeout) - : this (option, timeout, TransactionScopeAsyncFlowOption.Suppress) + public TransactionScope (TransactionScopeOption scopeOption, + TimeSpan scopeTimeout) + : this (scopeOption, scopeTimeout, TransactionScopeAsyncFlowOption.Suppress) { } @@ -80,25 +80,25 @@ namespace System.Transactions { } - public TransactionScope (TransactionScopeOption option, - TimeSpan timeout, TransactionScopeAsyncFlowOption asyncFlow) + public TransactionScope (TransactionScopeOption scopeOption, + TimeSpan scopeTimeout, TransactionScopeAsyncFlowOption asyncFlow) { - Initialize (option, null, defaultOptions, - DTCOption.None, timeout, asyncFlow); + Initialize (scopeOption, null, defaultOptions, + DTCOption.None, scopeTimeout, asyncFlow); } public TransactionScope (TransactionScopeOption scopeOption, - TransactionOptions options) - : this (scopeOption, options, DTCOption.None) + TransactionOptions transactionOptions) + : this (scopeOption, transactionOptions, DTCOption.None) { } [MonoTODO ("EnterpriseServicesInteropOption not supported")] public TransactionScope (TransactionScopeOption scopeOption, - TransactionOptions options, - DTCOption opt) + TransactionOptions transactionOptions, + DTCOption interopOption) { - Initialize (scopeOption, null, options, opt, + Initialize (scopeOption, null, transactionOptions, interopOption, TransactionManager.DefaultTimeout, TransactionScopeAsyncFlowOption.Suppress); } @@ -124,17 +124,17 @@ namespace System.Transactions void Initialize (TransactionScopeOption scopeOption, Transaction tx, TransactionOptions options, - DTCOption interop, TimeSpan timeout, TransactionScopeAsyncFlowOption asyncFlow) + DTCOption interop, TimeSpan scopeTimeout, TransactionScopeAsyncFlowOption asyncFlow) { completed = false; isRoot = false; nested = 0; asyncFlowEnabled = asyncFlow == TransactionScopeAsyncFlowOption.Enabled; - if (timeout < TimeSpan.Zero) - throw new ArgumentOutOfRangeException ("timeout"); + if (scopeTimeout < TimeSpan.Zero) + throw new ArgumentOutOfRangeException ("scopeTimeout"); - this.timeout = timeout; + this.timeout = scopeTimeout; oldTransaction = Transaction.CurrentInternal; diff --git a/mcs/class/System.Transactions/Test/TransactionScopeTest.cs b/mcs/class/System.Transactions/Test/TransactionScopeTest.cs index 1dbda6e1d2..a474c995e6 100644 --- a/mcs/class/System.Transactions/Test/TransactionScopeTest.cs +++ b/mcs/class/System.Transactions/Test/TransactionScopeTest.cs @@ -25,14 +25,14 @@ namespace MonoTests.System.Transactions TransactionScope scope = new TransactionScope (TransactionScopeOption.Required, TimeSpan.FromSeconds (-1)); Assert.Fail ("Expected exception when passing TransactionScopeOption and an invalid TimeSpan."); } catch (ArgumentOutOfRangeException ex) { - Assert.AreEqual (ex.ParamName, "timeout"); + Assert.AreEqual ("scopeTimeout", ex.ParamName); } try { TransactionScope scope = new TransactionScope (null, TimeSpan.FromSeconds (-1)); Assert.Fail ("Expected exception when passing TransactionScopeOption and an invalid TimeSpan."); } catch (ArgumentOutOfRangeException ex) { - Assert.AreEqual (ex.ParamName, "timeout"); + Assert.AreEqual ("scopeTimeout", ex.ParamName); } } diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProvider.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProvider.cs index 068e1c45cc..77a6fbeca3 100644 --- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProvider.cs +++ b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProvider.cs @@ -72,21 +72,21 @@ namespace System.Web.Security { } - public abstract bool ChangePassword (string name, string oldPwd, string newPwd); - public abstract bool ChangePasswordQuestionAndAnswer (string name, string password, string newPwdQuestion, string newPwdAnswer); - public abstract MembershipUser CreateUser (string username, string password, string email, string pwdQuestion, string pwdAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status); - public abstract bool DeleteUser (string name, bool deleteAllRelatedData); + public abstract bool ChangePassword (string username, string oldPassword, string newPassword); + public abstract bool ChangePasswordQuestionAndAnswer (string username, string password, string newPasswordQuestion, string newPasswordAnswer); + public abstract MembershipUser CreateUser (string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status); + public abstract bool DeleteUser (string username, bool deleteAllRelatedData); public abstract MembershipUserCollection FindUsersByEmail (string emailToMatch, int pageIndex, int pageSize, out int totalRecords); - public abstract MembershipUserCollection FindUsersByName (string nameToMatch, int pageIndex, int pageSize, out int totalRecords); + public abstract MembershipUserCollection FindUsersByName (string usernameToMatch, int pageIndex, int pageSize, out int totalRecords); public abstract MembershipUserCollection GetAllUsers (int pageIndex, int pageSize, out int totalRecords); public abstract int GetNumberOfUsersOnline (); - public abstract string GetPassword (string name, string answer); - public abstract MembershipUser GetUser (string name, bool userIsOnline); + public abstract string GetPassword (string username, string answer); + public abstract MembershipUser GetUser (string username, bool userIsOnline); public abstract MembershipUser GetUser (object providerUserKey, bool userIsOnline); public abstract string GetUserNameByEmail (string email); - public abstract string ResetPassword (string name, string answer); + public abstract string ResetPassword (string username, string answer); public abstract void UpdateUser (MembershipUser user); - public abstract bool ValidateUser (string name, string password); + public abstract bool ValidateUser (string username, string password); public abstract bool UnlockUser (string userName); public abstract string ApplicationName { get; set; } @@ -101,11 +101,11 @@ namespace System.Web.Security public abstract string PasswordStrengthRegularExpression { get; } public abstract bool RequiresUniqueEmail { get; } - protected virtual void OnValidatingPassword (ValidatePasswordEventArgs args) + protected virtual void OnValidatingPassword (ValidatePasswordEventArgs e) { MembershipValidatePasswordEventHandler eh = events [validatingPasswordEvent] as MembershipValidatePasswordEventHandler; if (eh != null) - eh (this, args); + eh (this, e); } protected virtual byte [] DecryptPassword (byte [] encodedPassword) diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUser.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUser.cs index c370f21661..5bb84e3149 100644 --- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUser.cs +++ b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUser.cs @@ -119,9 +119,9 @@ namespace System.Web.Security return GetPassword (null); } - public virtual string GetPassword (string answer) + public virtual string GetPassword (string passwordAnswer) { - return Provider.GetPassword (UserName, answer); + return Provider.GetPassword (UserName, passwordAnswer); } public virtual string ResetPassword () @@ -129,9 +129,9 @@ namespace System.Web.Security return ResetPassword (null); } - public virtual string ResetPassword (string answer) + public virtual string ResetPassword (string passwordAnswer) { - string newPass = Provider.ResetPassword (UserName, answer); + string newPass = Provider.ResetPassword (UserName, passwordAnswer); UpdateUser (); diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/RoleProvider.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/RoleProvider.cs index ad9079c09f..6ea6571844 100644 --- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/RoleProvider.cs +++ b/mcs/class/System.Web.ApplicationServices/System.Web.Security/RoleProvider.cs @@ -39,16 +39,16 @@ namespace System.Web.Security { } - public abstract void AddUsersToRoles (string [] usernames, string [] rolenames); - public abstract void CreateRole (string rolename); - public abstract bool DeleteRole (string rolename, bool throwOnPopulatedRole); + public abstract void AddUsersToRoles (string [] usernames, string [] roleNames); + public abstract void CreateRole (string roleName); + public abstract bool DeleteRole (string roleName, bool throwOnPopulatedRole); public abstract string [] FindUsersInRole (string roleName, string usernameToMatch); public abstract string [] GetAllRoles (); public abstract string [] GetRolesForUser (string username); - public abstract string [] GetUsersInRole (string rolename); - public abstract bool IsUserInRole (string username, string rolename); - public abstract void RemoveUsersFromRoles (string [] usernames, string [] rolenames); - public abstract bool RoleExists (string rolename); + public abstract string [] GetUsersInRole (string roleName); + public abstract bool IsUserInRole (string username, string roleName); + public abstract void RemoveUsersFromRoles (string [] usernames, string [] roleNames); + public abstract bool RoleExists (string roleName); public abstract string ApplicationName { get; set; } } } diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile index 5d3f278247..dc21bcf31c 100644 --- a/mcs/class/System.Web.Extensions/Makefile +++ b/mcs/class/System.Web.Extensions/Makefile @@ -86,7 +86,11 @@ $(STANDALONE_TEST_ASSEMBLY): $(the_assembly) Test/standalone-tests/Consts.cs $(CSCOMPILE) $(STANDALONE_TEST_MCS_FLAGS) -out:$@ -target:library @System.Web.Extensions_standalone_test.dll.sources Test/standalone-tests/Consts.cs: Test/standalone-tests/Consts.cs.in +ifeq ($(PLATFORM), win32) + @sed 's,@SystemWebExtensionsClassDir@,$(shell cygpath -a -m .),' $< > $@ +else @sed 's,@SystemWebExtensionsClassDir@,$(shell pwd),' $< > $@ +endif include ../../build/library.make diff --git a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs index 9c05b6da13..fc53ba0bb3 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs +++ b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs @@ -1,4 +1,4 @@ -// +// // ScriptModule.cs // // Author: @@ -37,10 +37,10 @@ namespace System.Web.Handlers { public class ScriptModule : IHttpModule { - protected virtual void Init (HttpApplication context) { - context.PreSendRequestHeaders += new EventHandler (PreSendRequestHeaders); - context.PostAcquireRequestState += new EventHandler (PostAcquireRequestState); - context.AuthenticateRequest += new EventHandler (AuthenticateRequest); + protected virtual void Init (HttpApplication app) { + app.PreSendRequestHeaders += new EventHandler (PreSendRequestHeaders); + app.PostAcquireRequestState += new EventHandler (PostAcquireRequestState); + app.AuthenticateRequest += new EventHandler (AuthenticateRequest); } void AuthenticateRequest (object sender, EventArgs e) { diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptResourceAttribute.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptResourceAttribute.cs index bb3c401d54..f09ccc9adc 100644 --- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptResourceAttribute.cs +++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptResourceAttribute.cs @@ -1,4 +1,4 @@ -// +// // ScriptResourceAttribute.cs // // Author: @@ -40,10 +40,10 @@ namespace System.Web.UI string _scriptResourceName; string _typeName; - public ScriptResourceAttribute (string scriptName, string scriptResourceName, string typeName) { + public ScriptResourceAttribute (string scriptName, string stringResourceName, string stringResourceClientTypeName) { _scriptName = scriptName; - _scriptResourceName = scriptResourceName; - _typeName = typeName; + _scriptResourceName = stringResourceName; + _typeName = stringResourceClientTypeName; } public string ScriptName { diff --git a/mcs/class/System.Web.Extensions/Test/standalone-tests/DataPager_NumericPagerField_Bug615315.cs b/mcs/class/System.Web.Extensions/Test/standalone-tests/DataPager_NumericPagerField_Bug615315.cs index ab36ccf501..2e8a8b33a8 100644 --- a/mcs/class/System.Web.Extensions/Test/standalone-tests/DataPager_NumericPagerField_Bug615315.cs +++ b/mcs/class/System.Web.Extensions/Test/standalone-tests/DataPager_NumericPagerField_Bug615315.cs @@ -57,7 +57,7 @@ namespace StandAloneTests.DataPager_NumericPagerField_Bug615315 void TestQueryMode_Aspx_Start (string result, TestRunItem runItem) { - string originalHtml = @"First 1 2 3 4 5  ... Last "; + string originalHtml = @"First 1 2 3 4 5  ... Last "; Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1"); } @@ -127,25 +127,25 @@ namespace StandAloneTests.DataPager_NumericPagerField_Bug615315 void TestPostBackMode_Aspx_Start (string result, TestRunItem runItem) { - string originalHtml = @" 1 2 3 4 5  ...  "; + string originalHtml = @" 1 2 3 4 5  ...  "; Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1"); } void TestPostBackMode_Aspx_Page2 (string result, TestRunItem runItem) { - string originalHtml = @" 1 2 3 4 5  ...  "; + string originalHtml = @" 1 2 3 4 5  ...  "; Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1"); } void TestPostBackMode_Aspx_PageNext (string result, TestRunItem runItem) { - string originalHtml = @" ... 6 7 8 9 10  "; + string originalHtml = @" ... 6 7 8 9 10  "; Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1"); } void TestPostBackMode_Aspx_PagePrev (string result, TestRunItem runItem) { - string originalHtml = @" 1 2 3 4 5  ...  "; + string originalHtml = @" 1 2 3 4 5  ...  "; Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1"); } } diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs index eb12379d18..65c7d53885 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs @@ -45,9 +45,9 @@ namespace System.Web.Configuration properties = new ConfigurationPropertyCollection(); } - public void Add (AssemblyInfo info) + public void Add (AssemblyInfo assemblyInformation) { - BaseAdd (info, false); + BaseAdd (assemblyInformation, false); } public void Clear () diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModesCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModesCollection.cs index 9150b7b772..812b4b5fa4 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModesCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModesCollection.cs @@ -74,8 +74,8 @@ namespace System.Web.Configuration { set { if (BaseGet(index) != null) BaseRemoveAt(index); BaseAdd(index, value); } } - public new BufferModeSettings this [string name] { - get { return (BufferModeSettings) BaseGet (name); } + public new BufferModeSettings this [string key] { + get { return (BufferModeSettings) BaseGet (key); } } protected internal override ConfigurationPropertyCollection Properties { diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/EventMappingSettingsCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/EventMappingSettingsCollection.cs index 4ef5798fc2..f35c51aac5 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/EventMappingSettingsCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/EventMappingSettingsCollection.cs @@ -99,8 +99,8 @@ namespace System.Web.Configuration { set { if (BaseGet (index) != null) BaseRemoveAt (index); BaseAdd (index, value); } } - public new EventMappingSettings this [string name] { - get { return (EventMappingSettings) BaseGet (name); } + public new EventMappingSettings this [string key] { + get { return (EventMappingSettings) BaseGet (key); } } protected internal override ConfigurationPropertyCollection Properties { diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModuleActionCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModuleActionCollection.cs index 7d314ac73c..dd44ba4fa2 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModuleActionCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModuleActionCollection.cs @@ -48,9 +48,9 @@ namespace System.Web.Configuration { } - public void Add (HttpModuleAction httpModuleAction) + public void Add (HttpModuleAction httpModule) { - BaseAdd (httpModuleAction); + BaseAdd (httpModule); } public void Clear () diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ProfileSettingsCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ProfileSettingsCollection.cs index cb506ccf31..d3dffccb01 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/ProfileSettingsCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ProfileSettingsCollection.cs @@ -94,8 +94,8 @@ namespace System.Web.Configuration { BaseRemoveAt (index); } - public new ProfileSettings this [string name] { - get { return (ProfileSettings)BaseGet (name); } + public new ProfileSettings this [string key] { + get { return (ProfileSettings)BaseGet (key); } } public ProfileSettings this [int index] { diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/RootProfilePropertySettingsCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/RootProfilePropertySettingsCollection.cs index 2b66727eb5..eff9ad76e3 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/RootProfilePropertySettingsCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/RootProfilePropertySettingsCollection.cs @@ -51,9 +51,9 @@ namespace System.Web.Configuration groupSettings = new ProfileGroupSettingsCollection (); } - public override bool Equals (object obj) + public override bool Equals (object rootProfilePropertySettingsCollection) { - RootProfilePropertySettingsCollection col = obj as RootProfilePropertySettingsCollection; + RootProfilePropertySettingsCollection col = rootProfilePropertySettingsCollection as RootProfilePropertySettingsCollection; if (col == null) return false; diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettingsCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettingsCollection.cs index 75ccd99b20..8598559f45 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettingsCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettingsCollection.cs @@ -94,8 +94,8 @@ namespace System.Web.Configuration { BaseRemoveAt (index); } - public new RuleSettings this [string name] { - get { return (RuleSettings) BaseGet (name); } + public new RuleSettings this [string key] { + get { return (RuleSettings) BaseGet (key); } } public RuleSettings this [int index] { diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TagMapInfo.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TagMapInfo.cs index a8b129a119..efdc494102 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/TagMapInfo.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/TagMapInfo.cs @@ -69,9 +69,9 @@ namespace System.Web.Configuration this.MappedTagType = mappedTagTypeName; } - public override bool Equals (object map) + public override bool Equals (object o) { - TagMapInfo info = map as TagMapInfo; + TagMapInfo info = o as TagMapInfo; if (info == null) return false; diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs index 478a207d82..0409784193 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs @@ -99,8 +99,8 @@ namespace System.Web.Configuration { get { return "trustLevel"; } } - public new TrustLevel this [string name] { - get { return (TrustLevel) BaseGet (name); } + public new TrustLevel this [string key] { + get { return (TrustLevel) BaseGet (key); } } public TrustLevel this [int index] { diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs index 93fcadc9b6..8f81fd61c4 100644 --- a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs +++ b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs @@ -37,8 +37,8 @@ namespace System.Web.Hosting public interface IAppManagerAppDomainFactory { [return: MarshalAs (UnmanagedType.Interface)] - object Create ([In, MarshalAs(UnmanagedType.BStr)] string s, - [In, MarshalAs(UnmanagedType.BStr)] string app_id); + object Create ([In, MarshalAs(UnmanagedType.BStr)] string appId, + [In, MarshalAs(UnmanagedType.BStr)] string appPath); void Stop (); } } diff --git a/mcs/class/System.Web/System.Web.Management/IWebEventCustomEvaluator.cs b/mcs/class/System.Web/System.Web.Management/IWebEventCustomEvaluator.cs index 9a8c42dc6f..d464225847 100644 --- a/mcs/class/System.Web/System.Web.Management/IWebEventCustomEvaluator.cs +++ b/mcs/class/System.Web/System.Web.Management/IWebEventCustomEvaluator.cs @@ -33,6 +33,6 @@ namespace System.Web.Management { public interface IWebEventCustomEvaluator { - bool CanFire (WebBaseEvent raised_event, RuleFiringRecord record); + bool CanFire (WebBaseEvent raisedEvent, RuleFiringRecord record); } } diff --git a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs index a7cd1a8e04..ef2adb8bda 100644 --- a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs +++ b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs @@ -36,19 +36,19 @@ namespace System.Web.Management object event_source; int event_code, event_detail_code; - protected WebBaseEvent (string message, object event_source, int event_code) + protected WebBaseEvent (string message, object eventSource, int eventCode) { this.message = message; - this.event_source = event_source; - this.event_code = event_code; + this.event_source = eventSource; + this.event_code = eventCode; } - protected WebBaseEvent (string message, object event_source, int event_code, int event_detail_code) + protected WebBaseEvent (string message, object eventSource, int eventCode, int eventDetailCode) { this.message = message; - this.event_source = event_source; - this.event_code = event_code; - this.event_detail_code = event_detail_code; + this.event_source = eventSource; + this.event_code = eventCode; + this.event_detail_code = eventDetailCode; } public static WebApplicationInformation ApplicationInformation { @@ -116,7 +116,7 @@ namespace System.Web.Management throw new NotImplementedException (); } - public static void Raise (WebBaseEvent event_raised) + public static void Raise (WebBaseEvent eventRaised) { throw new NotImplementedException (); } @@ -126,7 +126,7 @@ namespace System.Web.Management throw new NotImplementedException (); } - public virtual string ToString (bool include_app_info, bool include_custom_event_details) + public virtual string ToString (bool includeAppInfo, bool includeCustomEventDetails) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Web/System.Web.Security/ActiveDirectoryMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/ActiveDirectoryMembershipProvider.cs index 79b503fc67..4d40d02016 100644 --- a/mcs/class/System.Web/System.Web.Security/ActiveDirectoryMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/ActiveDirectoryMembershipProvider.cs @@ -37,19 +37,19 @@ namespace System.Web.Security { public class ActiveDirectoryMembershipProvider : MembershipProvider { [MonoTODO ("Not implemented")] - public override bool ChangePassword (string username, string oldPwd, string newPwd) + public override bool ChangePassword (string username, string oldPassword, string newPassword) { throw new NotImplementedException (); } [MonoTODO ("Not implemented")] - public override bool ChangePasswordQuestionAndAnswer (string username, string password, string newPwdQuestion, string newPwdAnswer) + public override bool ChangePasswordQuestionAndAnswer (string username, string password, string newPasswordQuestion, string newPasswordAnswer) { throw new NotImplementedException (); } [MonoTODO ("Not implemented")] - public override MembershipUser CreateUser (string username, string password, string email, string pwdQuestion, string pwdAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) + public override MembershipUser CreateUser (string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) { throw new NotImplementedException (); } @@ -73,7 +73,7 @@ namespace System.Web.Security { } [MonoTODO ("Not implemented")] - public override MembershipUserCollection FindUsersByName (string nameToMatch, int pageIndex, int pageSize, out int totalRecords) + public override MembershipUserCollection FindUsersByName (string usernameToMatch, int pageIndex, int pageSize, out int totalRecords) { throw new NotImplementedException (); } @@ -91,7 +91,7 @@ namespace System.Web.Security { } [MonoTODO("Not implemented")] - public override string GetPassword (string username, string answer) + public override string GetPassword (string username, string passwordAnswer) { throw new NotImplementedException (); } @@ -121,7 +121,7 @@ namespace System.Web.Security { } [MonoTODO("Not implemented")] - public override string ResetPassword (string username, string answer) + public override string ResetPassword (string username, string passwordAnswer) { throw new NotImplementedException (); } @@ -139,7 +139,7 @@ namespace System.Web.Security { } [MonoTODO("Not implemented")] - public override bool UnlockUser (string userName) + public override bool UnlockUser (string username) { throw new NotImplementedException (); } diff --git a/mcs/class/System.Web/System.Web.Security/Membership.cs b/mcs/class/System.Web/System.Web.Security/Membership.cs index dbedffc04b..35fd75d96d 100644 --- a/mcs/class/System.Web/System.Web.Security/Membership.cs +++ b/mcs/class/System.Web/System.Web.Security/Membership.cs @@ -83,12 +83,12 @@ namespace System.Web.Security return usr; } - public static MembershipUser CreateUser (string username, string password, string email, string pwdQuestion, string pwdAnswer, bool isApproved, out MembershipCreateStatus status) + public static MembershipUser CreateUser (string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, out MembershipCreateStatus status) { - return CreateUser (username, password, email, pwdQuestion, pwdAnswer, isApproved, null, out status); + return CreateUser (username, password, email, passwordQuestion, passwordAnswer, isApproved, null, out status); } - public static MembershipUser CreateUser (string username, string password, string email, string pwdQuestion, string pwdAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) + public static MembershipUser CreateUser (string username, string password, string email, string passwordQuestion, string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) { if (String.IsNullOrEmpty (username)) { status = MembershipCreateStatus.InvalidUserName; @@ -100,7 +100,7 @@ namespace System.Web.Security return null; } - return Provider.CreateUser (username, password, email, pwdQuestion, pwdAnswer, isApproved, providerUserKey, out status); + return Provider.CreateUser (username, password, email, passwordQuestion, passwordAnswer, isApproved, providerUserKey, out status); } public static bool DeleteUser (string username) @@ -221,9 +221,9 @@ namespace System.Web.Security return Provider.GetUser (providerUserKey, userIsOnline); } - public static string GetUserNameByEmail (string email) + public static string GetUserNameByEmail (string emailToMatch) { - return Provider.GetUserNameByEmail (email); + return Provider.GetUserNameByEmail (emailToMatch); } public static void UpdateUser (MembershipUser user) @@ -247,15 +247,15 @@ namespace System.Web.Security return Provider.FindUsersByEmail (emailToMatch, pageIndex, pageSize, out totalRecords); } - public static MembershipUserCollection FindUsersByName (string nameToMatch) + public static MembershipUserCollection FindUsersByName (string usernameToMatch) { int totalRecords; - return Provider.FindUsersByName (nameToMatch, 0, int.MaxValue, out totalRecords); + return Provider.FindUsersByName (usernameToMatch, 0, int.MaxValue, out totalRecords); } - public static MembershipUserCollection FindUsersByName (string nameToMatch, int pageIndex, int pageSize, out int totalRecords) + public static MembershipUserCollection FindUsersByName (string usernameToMatch, int pageIndex, int pageSize, out int totalRecords) { - return Provider.FindUsersByName (nameToMatch, pageIndex, pageSize, out totalRecords); + return Provider.FindUsersByName (usernameToMatch, pageIndex, pageSize, out totalRecords); } public static string ApplicationName { diff --git a/mcs/class/System.Web/System.Web.Security/Roles.cs b/mcs/class/System.Web/System.Web.Security/Roles.cs index 7ec98ead7d..f799c71258 100644 --- a/mcs/class/System.Web/System.Web.Security/Roles.cs +++ b/mcs/class/System.Web/System.Web.Security/Roles.cs @@ -46,29 +46,29 @@ namespace System.Web.Security { } - public static void AddUsersToRole (string [] usernames, string rolename) + public static void AddUsersToRole (string [] usernames, string roleName) { - Provider.AddUsersToRoles (usernames, new string[] {rolename}); + Provider.AddUsersToRoles (usernames, new string[] {roleName}); } - public static void AddUsersToRoles (string [] usernames, string [] rolenames) + public static void AddUsersToRoles (string [] usernames, string [] roleNames) { - Provider.AddUsersToRoles (usernames, rolenames); + Provider.AddUsersToRoles (usernames, roleNames); } - public static void AddUserToRole (string username, string rolename) + public static void AddUserToRole (string username, string roleName) { - Provider.AddUsersToRoles (new string[] {username}, new string[] {rolename}); + Provider.AddUsersToRoles (new string[] {username}, new string[] {roleName}); } - public static void AddUserToRoles (string username, string [] rolenames) + public static void AddUserToRoles (string username, string [] roleNames) { - Provider.AddUsersToRoles (new string[] {username}, rolenames); + Provider.AddUsersToRoles (new string[] {username}, roleNames); } - public static void CreateRole (string rolename) + public static void CreateRole (string roleName) { - Provider.CreateRole (rolename); + Provider.CreateRole (roleName); } public static void DeleteCookie () @@ -91,14 +91,14 @@ namespace System.Web.Security { } } - public static bool DeleteRole (string rolename) + public static bool DeleteRole (string roleName) { - return Provider.DeleteRole (rolename, true); + return Provider.DeleteRole (roleName, true); } - public static bool DeleteRole (string rolename, bool throwOnPopulatedRole) + public static bool DeleteRole (string roleName, bool throwOnPopulatedRole) { - return Provider.DeleteRole (rolename, throwOnPopulatedRole); + return Provider.DeleteRole (roleName, throwOnPopulatedRole); } public static string [] GetAllRoles () @@ -125,51 +125,51 @@ namespace System.Web.Security { return Provider.GetRolesForUser (username); } - public static string [] GetUsersInRole (string rolename) + public static string [] GetUsersInRole (string roleName) { - return Provider.GetUsersInRole (rolename); + return Provider.GetUsersInRole (roleName); } - public static bool IsUserInRole (string rolename) + public static bool IsUserInRole (string roleName) { - return IsUserInRole (CurrentUser, rolename); + return IsUserInRole (CurrentUser, roleName); } - public static bool IsUserInRole (string username, string rolename) + public static bool IsUserInRole (string username, string roleName) { if (String.IsNullOrEmpty (username)) return false; - return Provider.IsUserInRole (username, rolename); + return Provider.IsUserInRole (username, roleName); } - public static void RemoveUserFromRole (string username, string rolename) + public static void RemoveUserFromRole (string username, string roleName) { - Provider.RemoveUsersFromRoles (new string[] {username}, new string[] {rolename}); + Provider.RemoveUsersFromRoles (new string[] {username}, new string[] {roleName}); } - public static void RemoveUserFromRoles (string username, string [] rolenames) + public static void RemoveUserFromRoles (string username, string [] roleNames) { - Provider.RemoveUsersFromRoles (new string[] {username}, rolenames); + Provider.RemoveUsersFromRoles (new string[] {username}, roleNames); } - public static void RemoveUsersFromRole (string [] usernames, string rolename) + public static void RemoveUsersFromRole (string [] usernames, string roleName) { - Provider.RemoveUsersFromRoles (usernames, new string[] {rolename}); + Provider.RemoveUsersFromRoles (usernames, new string[] {roleName}); } - public static void RemoveUsersFromRoles (string [] usernames, string [] rolenames) + public static void RemoveUsersFromRoles (string [] usernames, string [] roleNames) { - Provider.RemoveUsersFromRoles (usernames, rolenames); + Provider.RemoveUsersFromRoles (usernames, roleNames); } - public static bool RoleExists (string rolename) + public static bool RoleExists (string roleName) { - return Provider.RoleExists (rolename); + return Provider.RoleExists (roleName); } - public static string[] FindUsersInRole (string rolename, string usernameToMatch) + public static string[] FindUsersInRole (string roleName, string usernameToMatch) { - return Provider.FindUsersInRole (rolename, usernameToMatch); + return Provider.FindUsersInRole (roleName, usernameToMatch); } public static string ApplicationName { diff --git a/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs index cca4e83816..820acd502e 100644 --- a/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs @@ -122,28 +122,28 @@ namespace System.Web.Security { throw new ArgumentException (String.Format ("invalid format for {0}", pName)); } - public override bool ChangePassword (string username, string oldPwd, string newPwd) + public override bool ChangePassword (string username, string oldPassword, string newPassword) { if (username != null) username = username.Trim (); - if (oldPwd != null) oldPwd = oldPwd.Trim (); - if (newPwd != null) newPwd = newPwd.Trim (); + if (oldPassword != null) oldPassword = oldPassword.Trim (); + if (newPassword != null) newPassword = newPassword.Trim (); CheckParam ("username", username, 256); - CheckParam ("oldPwd", oldPwd, 128); - CheckParam ("newPwd", newPwd, 128); + CheckParam ("oldPassword", oldPassword, 128); + CheckParam ("newPassword", newPassword, 128); - if (!CheckPassword (newPwd)) + if (!CheckPassword (newPassword)) throw new ArgumentException (string.Format ( "New Password invalid. New Password length minimum: {0}. Non-alphanumeric characters required: {1}.", MinRequiredPasswordLength, MinRequiredNonAlphanumericCharacters)); using (DbConnection connection = CreateConnection ()) { - PasswordInfo pi = ValidateUsingPassword (username, oldPwd); + PasswordInfo pi = ValidateUsingPassword (username, oldPassword); if (pi != null) { - EmitValidatingPassword (username, newPwd, false); - string db_password = EncodePassword (newPwd, pi.PasswordFormat, pi.PasswordSalt); + EmitValidatingPassword (username, newPassword, false); + string db_password = EncodePassword (newPassword, pi.PasswordFormat, pi.PasswordSalt); DbCommand command = factory.CreateCommand (); command.Connection = connection; @@ -169,23 +169,23 @@ namespace System.Web.Security { } } - public override bool ChangePasswordQuestionAndAnswer (string username, string password, string newPwdQuestion, string newPwdAnswer) + public override bool ChangePasswordQuestionAndAnswer (string username, string password, string newPasswordQuestion, string newPasswordAnswer) { if (username != null) username = username.Trim (); - if (newPwdQuestion != null) newPwdQuestion = newPwdQuestion.Trim (); - if (newPwdAnswer != null) newPwdAnswer = newPwdAnswer.Trim (); + if (newPasswordQuestion != null) newPasswordQuestion = newPasswordQuestion.Trim (); + if (newPasswordAnswer != null) newPasswordAnswer = newPasswordAnswer.Trim (); CheckParam ("username", username, 256); if (RequiresQuestionAndAnswer) - CheckParam ("newPwdQuestion", newPwdQuestion, 128); + CheckParam ("newPasswordQuestion", newPasswordQuestion, 128); if (RequiresQuestionAndAnswer) - CheckParam ("newPwdAnswer", newPwdAnswer, 128); + CheckParam ("newPasswordAnswer", newPasswordAnswer, 128); using (DbConnection connection = CreateConnection ()) { PasswordInfo pi = ValidateUsingPassword (username, password); if (pi != null) { - string db_passwordAnswer = EncodePassword (newPwdAnswer, pi.PasswordFormat, pi.PasswordSalt); + string db_passwordAnswer = EncodePassword (newPasswordAnswer, pi.PasswordFormat, pi.PasswordSalt); DbCommand command = factory.CreateCommand (); command.Connection = connection; @@ -194,7 +194,7 @@ namespace System.Web.Security { AddParameter (command, "@ApplicationName", ApplicationName); AddParameter (command, "@UserName", username); - AddParameter (command, "@NewPasswordQuestion", newPwdQuestion); + AddParameter (command, "@NewPasswordQuestion", newPasswordQuestion); AddParameter (command, "@NewPasswordAnswer", db_passwordAnswer); DbParameter returnValue = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); @@ -212,8 +212,8 @@ namespace System.Web.Security { public override MembershipUser CreateUser (string username, string password, string email, - string pwdQuestion, - string pwdAnswer, + string passwordQuestion, + string passwordAnswer, bool isApproved, object providerUserKey, out MembershipCreateStatus status) @@ -221,8 +221,8 @@ namespace System.Web.Security { if (username != null) username = username.Trim (); if (password != null) password = password.Trim (); if (email != null) email = email.Trim (); - if (pwdQuestion != null) pwdQuestion = pwdQuestion.Trim (); - if (pwdAnswer != null) pwdAnswer = pwdAnswer.Trim (); + if (passwordQuestion != null) passwordQuestion = passwordQuestion.Trim (); + if (passwordAnswer != null) passwordAnswer = passwordAnswer.Trim (); /* some initial validation */ if (username == null || username.Length == 0 || username.Length > 256 || username.IndexOf (',') != -1) { @@ -245,14 +245,14 @@ namespace System.Web.Security { return null; } if (RequiresQuestionAndAnswer && - (pwdQuestion == null || - pwdQuestion.Length == 0 || pwdQuestion.Length > 256)) { + (passwordQuestion == null || + passwordQuestion.Length == 0 || passwordQuestion.Length > 256)) { status = MembershipCreateStatus.InvalidQuestion; return null; } if (RequiresQuestionAndAnswer && - (pwdAnswer == null || - pwdAnswer.Length == 0 || pwdAnswer.Length > 128)) { + (passwordAnswer == null || + passwordAnswer.Length == 0 || passwordAnswer.Length > 128)) { status = MembershipCreateStatus.InvalidAnswer; return null; } @@ -275,7 +275,7 @@ namespace System.Web.Security { password = EncodePassword (password, PasswordFormat, passwordSalt); if (RequiresQuestionAndAnswer) - pwdAnswer = EncodePassword (pwdAnswer, PasswordFormat, passwordSalt); + passwordAnswer = EncodePassword (passwordAnswer, PasswordFormat, passwordSalt); /* make sure the hashed/encrypted password and * answer are still under 128 characters. */ @@ -285,7 +285,7 @@ namespace System.Web.Security { } if (RequiresQuestionAndAnswer) { - if (pwdAnswer.Length > 128) { + if (passwordAnswer.Length > 128) { status = MembershipCreateStatus.InvalidAnswer; return null; } @@ -307,8 +307,8 @@ namespace System.Web.Security { AddParameter (command, "@Password", password); AddParameter (command, "@PasswordSalt", passwordSalt); AddParameter (command, "@Email", email); - AddParameter (command, "@PasswordQuestion", pwdQuestion); - AddParameter (command, "@PasswordAnswer", pwdAnswer); + AddParameter (command, "@PasswordQuestion", passwordQuestion); + AddParameter (command, "@PasswordAnswer", passwordAnswer); AddParameter (command, "@IsApproved", isApproved); AddParameter (command, "@CurrentTimeUtc", Now); AddParameter (command, "@CreateDate", Now); @@ -429,9 +429,9 @@ namespace System.Web.Security { } } - public override MembershipUserCollection FindUsersByName (string nameToMatch, int pageIndex, int pageSize, out int totalRecords) + public override MembershipUserCollection FindUsersByName (string usernameToMatch, int pageIndex, int pageSize, out int totalRecords) { - CheckParam ("nameToMatch", nameToMatch, 256); + CheckParam ("usernameToMatch", usernameToMatch, 256); if (pageIndex < 0) throw new ArgumentException ("pageIndex must be >= 0"); @@ -449,7 +449,7 @@ namespace System.Web.Security { AddParameter (command, "@PageIndex", pageIndex); AddParameter (command, "@PageSize", pageSize); - AddParameter (command, "@UserNameToMatch", nameToMatch); + AddParameter (command, "@UserNameToMatch", usernameToMatch); AddParameter (command, "@ApplicationName", ApplicationName); // return value AddParameter (command, "@ReturnValue", ParameterDirection.ReturnValue, null); @@ -529,20 +529,20 @@ namespace System.Web.Security { } } - public override string GetPassword (string username, string answer) + public override string GetPassword (string username, string passwordAnswer) { if (!EnablePasswordRetrieval) throw new NotSupportedException ("this provider has not been configured to allow the retrieval of passwords"); CheckParam ("username", username, 256); if (RequiresQuestionAndAnswer) - CheckParam ("answer", answer, 128); + CheckParam ("passwordAnswer", passwordAnswer, 128); PasswordInfo pi = GetPasswordInfo (username); if (pi == null) throw new ProviderException ("An error occurred while retrieving the password from the database"); - string user_answer = EncodePassword (answer, pi.PasswordFormat, pi.PasswordSalt); + string user_answer = EncodePassword (passwordAnswer, pi.PasswordFormat, pi.PasswordSalt); string password = null; using (DbConnection connection = CreateConnection ()) { @@ -790,7 +790,7 @@ namespace System.Web.Security { ProvidersHelper.GetDbProviderFactory (connectionString.ProviderName); } - public override string ResetPassword (string username, string answer) + public override string ResetPassword (string username, string passwordAnswer) { if (!EnablePasswordReset) throw new NotSupportedException ("this provider has not been configured to allow the resetting of passwords"); @@ -798,7 +798,7 @@ namespace System.Web.Security { CheckParam ("username", username, 256); if (RequiresQuestionAndAnswer) - CheckParam ("answer", answer, 128); + CheckParam ("passwordAnswer", passwordAnswer, 128); using (DbConnection connection = CreateConnection ()) { @@ -810,7 +810,7 @@ namespace System.Web.Security { EmitValidatingPassword (username, newPassword, false); string db_password = EncodePassword (newPassword, pi.PasswordFormat, pi.PasswordSalt); - string db_answer = EncodePassword (answer, pi.PasswordFormat, pi.PasswordSalt); + string db_answer = EncodePassword (passwordAnswer, pi.PasswordFormat, pi.PasswordSalt); DbCommand command = factory.CreateCommand (); command.Connection = connection; diff --git a/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs b/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs index 76ed81a58f..770645f044 100644 --- a/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs @@ -87,7 +87,7 @@ namespace System.Web.Security return dbp; } - public override void AddUsersToRoles (string [] usernames, string [] rolenames) + public override void AddUsersToRoles (string [] usernames, string [] roleNames) { Hashtable h = new Hashtable (); @@ -102,7 +102,7 @@ namespace System.Web.Security } h = new Hashtable (); - foreach (string r in rolenames) { + foreach (string r in roleNames) { if (r == null) throw new ArgumentNullException ("null element in rolenames array"); if (h.ContainsKey (r)) @@ -119,7 +119,7 @@ namespace System.Web.Security command.Connection = connection; command.CommandType = CommandType.StoredProcedure; - AddParameter (command, "@RoleNames", String.Join (",", rolenames)); + AddParameter (command, "@RoleNames", String.Join (",", roleNames)); AddParameter (command, "@UserNames", String.Join (",", usernames)); AddParameter (command, "@ApplicationName", ApplicationName); AddParameter (command, "@CurrentTimeUtc", DateTime.UtcNow); @@ -139,12 +139,12 @@ namespace System.Web.Security } } - public override void CreateRole (string rolename) + public override void CreateRole (string roleName) { - if (rolename == null) - throw new ArgumentNullException ("rolename"); + if (roleName == null) + throw new ArgumentNullException ("roleName"); - if (rolename.Length == 0 || rolename.Length > 256 || rolename.IndexOf (',') != -1) + if (roleName.Length == 0 || roleName.Length > 256 || roleName.IndexOf (',') != -1) throw new ArgumentException ("rolename is in invalid format"); using (DbConnection connection = CreateConnection ()) { @@ -154,25 +154,25 @@ namespace System.Web.Security command.CommandType = CommandType.StoredProcedure; AddParameter (command, "@ApplicationName", ApplicationName); - AddParameter (command, "@RoleName", rolename); + AddParameter (command, "@RoleName", roleName); DbParameter dbpr = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); command.ExecuteNonQuery (); int returnValue = (int) dbpr.Value; if (returnValue == 1) - throw new ProviderException (rolename + " already exists in the database"); + throw new ProviderException (roleName + " already exists in the database"); else return; } } - public override bool DeleteRole (string rolename, bool throwOnPopulatedRole) + public override bool DeleteRole (string roleName, bool throwOnPopulatedRole) { - if (rolename == null) - throw new ArgumentNullException ("rolename"); + if (roleName == null) + throw new ArgumentNullException ("roleName"); - if (rolename.Length == 0 || rolename.Length > 256 || rolename.IndexOf (',') != -1) + if (roleName.Length == 0 || roleName.Length > 256 || roleName.IndexOf (',') != -1) throw new ArgumentException ("rolename is in invalid format"); using (DbConnection connection = CreateConnection ()) { @@ -182,7 +182,7 @@ namespace System.Web.Security command.Connection = connection; command.CommandType = CommandType.StoredProcedure; AddParameter (command, "@ApplicationName", ApplicationName); - AddParameter (command, "@RoleName", rolename); + AddParameter (command, "@RoleName", roleName); AddParameter (command, "@DeleteOnlyIfRoleIsEmpty", throwOnPopulatedRole); DbParameter dbpr = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); @@ -194,7 +194,7 @@ namespace System.Web.Security if (returnValue == 1) return false; //role does not exist else if (returnValue == 2 && throwOnPopulatedRole) - throw new ProviderException (rolename + " is not empty"); + throw new ProviderException (roleName + " is not empty"); else return false; } @@ -272,7 +272,7 @@ namespace System.Web.Security } } - public override string [] GetUsersInRole (string rolename) + public override string [] GetUsersInRole (string roleName) { using (DbConnection connection = CreateConnection ()) { DbCommand command = factory.CreateCommand (); @@ -280,7 +280,7 @@ namespace System.Web.Security command.Connection = connection; command.CommandType = CommandType.StoredProcedure; - AddParameter (command, "@RoleName", rolename); + AddParameter (command, "@RoleName", roleName); AddParameter (command, "@ApplicationName", ApplicationName); DbDataReader reader = command.ExecuteReader (); @@ -327,7 +327,7 @@ namespace System.Web.Security ProvidersHelper.GetDbProviderFactory (connectionString.ProviderName); } - public override bool IsUserInRole (string username, string rolename) + public override bool IsUserInRole (string username, string roleName) { using (DbConnection connection = CreateConnection ()) { DbCommand command = factory.CreateCommand (); @@ -335,7 +335,7 @@ namespace System.Web.Security command.Connection = connection; command.CommandType = CommandType.StoredProcedure; - AddParameter (command, "@RoleName", rolename); + AddParameter (command, "@RoleName", roleName); AddParameter (command, "@UserName", username); AddParameter (command, "@ApplicationName", ApplicationName); DbParameter dbpr = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); @@ -350,7 +350,7 @@ namespace System.Web.Security } } - public override void RemoveUsersFromRoles (string [] usernames, string [] rolenames) + public override void RemoveUsersFromRoles (string [] usernames, string [] roleNames) { Hashtable h = new Hashtable (); @@ -365,7 +365,7 @@ namespace System.Web.Security } h = new Hashtable (); - foreach (string r in rolenames) { + foreach (string r in roleNames) { if (r == null) throw new ArgumentNullException ("null element in rolenames array"); if (h.ContainsKey (r)) @@ -382,7 +382,7 @@ namespace System.Web.Security command.CommandType = CommandType.StoredProcedure; AddParameter (command, "@UserNames", String.Join (",", usernames)); - AddParameter (command, "@RoleNames", String.Join (",", rolenames)); + AddParameter (command, "@RoleNames", String.Join (",", roleNames)); AddParameter (command, "@ApplicationName", ApplicationName); DbParameter dbpr = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); @@ -402,7 +402,7 @@ namespace System.Web.Security } } - public override bool RoleExists (string rolename) + public override bool RoleExists (string roleName) { using (DbConnection connection = CreateConnection ()) { @@ -412,7 +412,7 @@ namespace System.Web.Security command.CommandType = CommandType.StoredProcedure; AddParameter (command, "@ApplicationName", ApplicationName); - AddParameter (command, "@RoleName", rolename); + AddParameter (command, "@RoleName", roleName); DbParameter dbpr = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null); command.ExecuteNonQuery (); diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/HttpSessionState.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/HttpSessionState.cs index 9428f68e0a..f2b6e54b8e 100644 --- a/mcs/class/System.Web/System.Web.SessionState_2.0/HttpSessionState.cs +++ b/mcs/class/System.Web/System.Web.SessionState_2.0/HttpSessionState.cs @@ -86,9 +86,9 @@ public sealed class HttpSessionState : ICollection, IEnumerable get { return container.IsSynchronized; } } - public object this [string key] { - get { return container [key]; } - set { container [key] = value; } + public object this [string name] { + get { return container [name]; } + set { container [name] = value; } } public object this [int index] { diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/IHttpSessionState.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/IHttpSessionState.cs index b0bb4d0633..d3d5b80ab0 100644 --- a/mcs/class/System.Web/System.Web.SessionState_2.0/IHttpSessionState.cs +++ b/mcs/class/System.Web/System.Web.SessionState_2.0/IHttpSessionState.cs @@ -37,11 +37,11 @@ namespace System.Web.SessionState { { ///methods void Abandon (); - void Add (string itemName, object itemValue); + void Add (string name, object value); void Clear (); - void CopyTo (Array sessionValues, int index); + void CopyTo (Array array, int index); IEnumerator GetEnumerator (); - void Remove (string itemName); + void Remove (string name); void RemoveAll (); void RemoveAt (int index); diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionIDManager.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionIDManager.cs index 272ab9b8e2..d70a46a04a 100644 --- a/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionIDManager.cs +++ b/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionIDManager.cs @@ -41,7 +41,7 @@ namespace System.Web.SessionState { void Initialize (); bool InitializeRequest (HttpContext context, bool suppressAutoDetectRedirect, out bool supportSessionIDReissue); void RemoveSessionID (HttpContext context); - void SaveSessionID (HttpContext context, string sessionID, out bool isRedirected, out bool isCookieAdded); + void SaveSessionID (HttpContext context, string id, out bool redirected, out bool cookieAdded); bool Validate (string id); } } diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionStateItemCollection.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionStateItemCollection.cs index 56e8f0110a..9cabdb0bea 100644 --- a/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionStateItemCollection.cs +++ b/mcs/class/System.Web/System.Web.SessionState_2.0/ISessionStateItemCollection.cs @@ -36,7 +36,7 @@ namespace System.Web.SessionState { { ///methods void Clear (); - void Remove (string itemName); + void Remove (string name); void RemoveAt (int index); ///properties diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateStoreData.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateStoreData.cs index 7e4b770bcf..93343e98aa 100644 --- a/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateStoreData.cs +++ b/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateStoreData.cs @@ -38,12 +38,12 @@ namespace System.Web.SessionState { HttpStaticObjectsCollection staticObjects; int timeout; - public SessionStateStoreData (ISessionStateItemCollection items, - HttpStaticObjectsCollection objects, + public SessionStateStoreData (ISessionStateItemCollection sessionItems, + HttpStaticObjectsCollection staticObjects, int timeout) { - sessionItems = items; - staticObjects = objects; + this.sessionItems = sessionItems; + this.staticObjects = staticObjects; this.timeout = timeout; } diff --git a/mcs/class/System.Web/System.Web.UI.Adapters/ControlAdapter.cs b/mcs/class/System.Web/System.Web.UI.Adapters/ControlAdapter.cs index ea0aa13b97..9fe54d8b73 100644 --- a/mcs/class/System.Web/System.Web.UI.Adapters/ControlAdapter.cs +++ b/mcs/class/System.Web/System.Web.UI.Adapters/ControlAdapter.cs @@ -92,9 +92,9 @@ namespace System.Web.UI.Adapters } } - protected internal virtual void BeginRender (HtmlTextWriter w) + protected internal virtual void BeginRender (HtmlTextWriter writer) { - w.BeginRender(); + writer.BeginRender(); } protected internal virtual void CreateChildControls () @@ -104,9 +104,9 @@ namespace System.Web.UI.Adapters control.CreateChildControls (); } - protected internal virtual void EndRender (HtmlTextWriter w) + protected internal virtual void EndRender (HtmlTextWriter writer) { - w.EndRender (); + writer.EndRender (); } protected internal virtual void LoadAdapterControlState (object state) @@ -149,20 +149,20 @@ namespace System.Web.UI.Adapters control.OnUnload(e); } - protected internal virtual void Render (HtmlTextWriter w) + protected internal virtual void Render (HtmlTextWriter writer) { Control control = Control; if (control != null) - control.Render (w); + control.Render (writer); } - protected internal virtual void RenderChildren (HtmlTextWriter w) + protected internal virtual void RenderChildren (HtmlTextWriter writer) { Control control = Control; if (control != null) - control.RenderChildren (w); + control.RenderChildren (writer); } protected internal virtual object SaveAdapterControlState () diff --git a/mcs/class/System.Web/System.Web.UI.Adapters/PageAdapter.cs b/mcs/class/System.Web/System.Web.UI.Adapters/PageAdapter.cs index a86a98f71b..77a75ec3ac 100644 --- a/mcs/class/System.Web/System.Web.UI.Adapters/PageAdapter.cs +++ b/mcs/class/System.Web/System.Web.UI.Adapters/PageAdapter.cs @@ -89,23 +89,23 @@ namespace System.Web.UI.Adapters radioButtons.Add(radioButton); } - public virtual void RenderBeginHyperlink (HtmlTextWriter w, + public virtual void RenderBeginHyperlink (HtmlTextWriter writer, string targetUrl, bool encodeUrl, - string softKeyLabel) + string softkeyLabel) { - InternalRenderBeginHyperlink (w, targetUrl, encodeUrl, softKeyLabel, null); + InternalRenderBeginHyperlink (writer, targetUrl, encodeUrl, softkeyLabel, null); } - public virtual void RenderBeginHyperlink (HtmlTextWriter w, + public virtual void RenderBeginHyperlink (HtmlTextWriter writer, string targetUrl, bool encodeUrl, - string softKeyLabel, + string softkeyLabel, string accessKey) { if (accessKey != null && accessKey.Length > 1) throw new ArgumentOutOfRangeException("accessKey"); - InternalRenderBeginHyperlink (w, targetUrl, encodeUrl, softKeyLabel, accessKey); + InternalRenderBeginHyperlink (writer, targetUrl, encodeUrl, softkeyLabel, accessKey); } void InternalRenderBeginHyperlink (HtmlTextWriter w, @@ -121,35 +121,35 @@ namespace System.Web.UI.Adapters } - public virtual void RenderEndHyperlink (HtmlTextWriter w) + public virtual void RenderEndHyperlink (HtmlTextWriter writer) { - w.RenderEndTag(); + writer.RenderEndTag(); } - public virtual void RenderPostBackEvent (HtmlTextWriter w, + public virtual void RenderPostBackEvent (HtmlTextWriter writer, string target, string argument, - string softKeyLabel, + string softkeyLabel, string text) { - RenderPostBackEvent (w, target, argument, softKeyLabel, text, Page.Request.FilePath, null, true); + RenderPostBackEvent (writer, target, argument, softkeyLabel, text, Page.Request.FilePath, null, true); } - public virtual void RenderPostBackEvent (HtmlTextWriter w, + public virtual void RenderPostBackEvent (HtmlTextWriter writer, string target, string argument, - string softKeyLabel, + string softkeyLabel, string text, string postUrl, string accessKey) { - RenderPostBackEvent (w, target, argument, softKeyLabel, text, postUrl, accessKey, true); + RenderPostBackEvent (writer, target, argument, softkeyLabel, text, postUrl, accessKey, true); } - protected void RenderPostBackEvent (HtmlTextWriter w, + protected void RenderPostBackEvent (HtmlTextWriter writer, string target, string argument, - string softKeyLabel, + string softkeyLabel, string text, string postUrl, string accessKey, @@ -157,9 +157,9 @@ namespace System.Web.UI.Adapters { string url = String.Format ("{0}?__VIEWSTATE={1}&__EVENTTARGET={2}&__EVENTARGUMENT={3}&__PREVIOUSPAGE={4}", postUrl, HttpUtility.UrlEncode (Page.GetSavedViewState ()), target, argument, Page.Request.FilePath); - RenderBeginHyperlink (w, url, encode, softKeyLabel, accessKey); - w.Write(text); - RenderEndHyperlink(w); + RenderBeginHyperlink (writer, url, encode, softkeyLabel, accessKey); + writer.Write(text); + RenderEndHyperlink(writer); } public virtual string TransformText (string text) @@ -167,9 +167,9 @@ namespace System.Web.UI.Adapters return text; } - protected internal virtual string GetPostBackFormReference (string formID) + protected internal virtual string GetPostBackFormReference (string formId) { - return String.Format("document.forms['{0}']", formID); + return String.Format("document.forms['{0}']", formId); } ListDictionary radio_button_group; diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs index 495b941099..4fa9af17d0 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs @@ -216,7 +216,7 @@ namespace System.Web.UI.HtmlControls base.OnPreRender(e); } - protected override void RenderAttributes (HtmlTextWriter w) + protected override void RenderAttributes (HtmlTextWriter writer) { /* Need to always render: method, action and id */ @@ -268,12 +268,12 @@ namespace System.Web.UI.HtmlControls if (RenderingCompatibilityLessThan40) // LAMESPEC: MSDN says the 'name' attribute is rendered only in // Legacy mode, this is not true. - w.WriteAttribute ("name", Name); + writer.WriteAttribute ("name", Name); } - w.WriteAttribute ("method", Method); + writer.WriteAttribute ("method", Method); if (String.IsNullOrEmpty (customAction)) - w.WriteAttribute ("action", action, true); + writer.WriteAttribute ("action", action, true); /* * This is a hack that guarantees the ID is set properly for HtmlControl to @@ -292,7 +292,7 @@ namespace System.Web.UI.HtmlControls string submit = page != null ? page.GetSubmitStatements () : null; if (!String.IsNullOrEmpty (submit)) { Attributes.Remove ("onsubmit"); - w.WriteAttribute ("onsubmit", submit); + writer.WriteAttribute ("onsubmit", submit); } /* enctype and target should not be written if @@ -300,11 +300,11 @@ namespace System.Web.UI.HtmlControls */ string enctype = Enctype; if (!String.IsNullOrEmpty (enctype)) - w.WriteAttribute ("enctype", enctype); + writer.WriteAttribute ("enctype", enctype); string target = Target; if (!String.IsNullOrEmpty (target)) - w.WriteAttribute ("target", target); + writer.WriteAttribute ("target", target); string defaultbutton = DefaultButton; if (!String.IsNullOrEmpty (defaultbutton)) { @@ -315,7 +315,7 @@ namespace System.Web.UI.HtmlControls ID)); if (page != null && DetermineRenderUplevel ()) { - w.WriteAttribute ( + writer.WriteAttribute ( "onkeypress", "javascript:return " + page.WebFormScriptReference + ".WebForm_FireDefaultButton(event, '" + c.ClientID + "')"); } @@ -328,10 +328,10 @@ namespace System.Web.UI.HtmlControls Attributes.Remove ("enctype"); Attributes.Remove ("target"); - base.RenderAttributes (w); + base.RenderAttributes (writer); } - protected internal override void RenderChildren (HtmlTextWriter w) + protected internal override void RenderChildren (HtmlTextWriter writer) { Page page = Page; @@ -340,22 +340,22 @@ namespace System.Web.UI.HtmlControls page.RegisterForm (this); } if (page != null) - page.OnFormRender (w, ClientID); - base.RenderChildren (w); + page.OnFormRender (writer, ClientID); + base.RenderChildren (writer); if (page != null) - page.OnFormPostRender (w, ClientID); + page.OnFormPostRender (writer, ClientID); } /* According to corcompare */ [MonoTODO ("why override?")] - public override void RenderControl (HtmlTextWriter w) + public override void RenderControl (HtmlTextWriter writer) { - base.RenderControl (w); + base.RenderControl (writer); } - protected internal override void Render (HtmlTextWriter w) + protected internal override void Render (HtmlTextWriter output) { - base.Render (w); + base.Render (output); } } } diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs index 871e22e6ad..dfee694822 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs @@ -185,9 +185,9 @@ namespace System.Web.UI.HtmlControls } } - protected override void RenderAttributes (HtmlTextWriter w) + protected override void RenderAttributes (HtmlTextWriter writer) { - PreProcessRelativeReference (w, "src"); + PreProcessRelativeReference (writer, "src"); /* MS does not seem to render the src attribute if it * is empty. Firefox, at least, will fetch the current @@ -197,13 +197,13 @@ namespace System.Web.UI.HtmlControls if (src == null || src.Length == 0) Attributes.Remove ("src"); - base.RenderAttributes (w); + base.RenderAttributes (writer); /* MS closes the HTML element at the end of * the attributes too, according to the nunit * tests */ - w.Write (" /"); + writer.Write (" /"); } } } diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs index 5416e3af66..fb1dbdc20a 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs @@ -585,7 +585,7 @@ namespace System.Web.UI.HtmlControls } } - protected override void RenderAttributes (HtmlTextWriter w) + protected override void RenderAttributes (HtmlTextWriter writer) { Page page = Page; if (page != null) @@ -594,7 +594,7 @@ namespace System.Web.UI.HtmlControls /* If there is no "name" attribute, * LoadPostData doesn't work... */ - w.WriteAttribute ("name", Name); + writer.WriteAttribute ("name", Name); Attributes.Remove ("name"); /* Don't render the databinding attributes */ @@ -602,24 +602,24 @@ namespace System.Web.UI.HtmlControls Attributes.Remove ("datatextfield"); Attributes.Remove ("datavaluefield"); - base.RenderAttributes (w); + base.RenderAttributes (writer); } - protected internal override void RenderChildren (HtmlTextWriter w) + protected internal override void RenderChildren (HtmlTextWriter writer) { - base.RenderChildren (w); + base.RenderChildren (writer); if (items == null) return; - w.WriteLine (); + writer.WriteLine (); bool done_sel = false; int count = items.Count; for (int i = 0; i < count; i++) { ListItem item = items[i]; - w.Indent++; + writer.Indent++; /* Write the