diff options
59 files changed, 161 insertions, 510 deletions
diff --git a/ChangeLog b/ChangeLog index fb39b681c00..08168a9f248 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -2004-06-01 Raja R Harinath <rharinath@novell.com> - - * Makefile.am (bootstrap,faststrap,fasterstrap): Refactor. - Fix 'faststrap' to be corlib-version-change-safe. - (one-stage-strap,two-stage-strap,three-stage-strap): Remove. - (monolite-bootstrap): Update. - 2004-05-31 Gonzalo Paniagua Javier <gonzalo@ximian.com> * configure.in: fixlets for windows. diff --git a/Makefile.am b/Makefile.am index 1e22baea835..00c64e45385 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,16 +17,16 @@ endif DISTCLEANFILES= mono.pc mint.pc # -# The following targets are used to compile and install +# The following target is used to compile and install # mono and mcs without running into the out-of-sync # problems by doing the compilation in the right order. # mcs_topdir=$(top_srcdir)/../mcs -.PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap -.PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite -.PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test +.PHONY: tmpinst-dir tmpinst-basic-build tmpinst-short-build tmpinst-full-build +.PHONY: bootstrap faststrap fasterstrap one-stage-strap two-stage-strap three-stage-strap bootstrap-clean bootstrap-check +.PHONY: mono-do-basic-build mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test if USE_JIT mono_runtime = mono/mini/mono @@ -34,78 +34,69 @@ else mono_runtime = mono/interpreter/mint endif -# Minimal set of directories to build, and files used to run the 'mcs' compiler -MCS_BASIC_DIRS = jay mcs class/corlib class/System -MCS_BASIC_FILES = \ - $(mcs_topdir)/mcs/mcs.exe \ - $(mcs_topdir)/class/lib/default/mscorlib.dll \ - $(mcs_topdir)/class/lib/default/System.dll - -# Set of directories and files the 'mcs' compiler can use -## We build class/System twice to resolve the cyclic dependency of class/System.XML -MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger -MCS_FILES = $(MCS_BASIC_FILES) \ - $(mcs_topdir)/class/lib/default/System.Xml.dll \ - $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll - -bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only - $(MAKE) tmpinst-mcs-short-build - $(MAKE) fasterstrap - -faststrap: tmpinst-mcs-short-build - $(MAKE) mono-do-runtime-only - $(MAKE) fasterstrap - -fasterstrap: tmpinst-mcs-full-build - rm -f $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe - $(MAKE) - -bootstrap-clean: clean mcs-do-clean-profiles -bootstrap-check: check mcs-do-run-test +bootstrap: three-stage-strap -# building with monolite - -get-monolite-latest: - wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz +faststrap: mono-do-basic-build + $(MAKE) two-stage-strap -monolite-bootstrap: tmpinst-monolite mono-do-runtime-only - rm -f $(MCS_FILES) - $(MAKE) tmpinst-mcs-short-build - $(MAKE) fasterstrap +fasterstrap: mono-do-basic-build + $(MAKE) one-stage-strap -# internal targets +three-stage-strap: tmpinst-basic-build + $(MAKE) two-stage-strap -tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir - mv -f $(MCS_BASIC_FILES) _tmpinst/lib +two-stage-strap: tmpinst-short-build + $(MAKE) one-stage-strap -tmpinst-mcs-short-build: mcs-do-short-build - mv -f $(MCS_FILES) _tmpinst/lib +one-stage-strap: tmpinst-full-build + rm -f $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe + $(MAKE) -tmpinst-mcs-full-build: mcs-do-full-build - cp -f $(MCS_FILES) _tmpinst/lib +bootstrap-clean: clean mcs-do-clean-profiles +bootstrap-check: check mcs-do-run-test -tmpinst-monolite: tmpinst-dir - -rm -f _tmpinst/lib/mcs.exe _tmpinst/lib/*.dll - -rm -fr _tmpinst/monolite-* - srcdir=`cd $(srcdir) && pwd` && cd _tmpinst && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - ) - mv -f _tmpinst/monolite-*/mcs.exe _tmpinst/monolite-*/*.dll _tmpinst/lib - rm -fr _tmpinst/monolite-* +# (takes advantage of 'make -j': independent subtasks are separate dependencies) +tmpinst-basic-build: mcs-do-basic-build mono-do-basic-build tmpinst-dir + mv -f $(mcs_topdir)/mcs/mcs.exe \ + $(mcs_topdir)/class/lib/default/mscorlib.dll \ + $(mcs_topdir)/class/lib/default/System.dll \ + _tmpinst/lib + +tmpinst-short-build: mcs-do-short-build + mv -f $(mcs_topdir)/mcs/mcs.exe \ + $(mcs_topdir)/class/lib/default/mscorlib.dll \ + $(mcs_topdir)/class/lib/default/System.dll \ + $(mcs_topdir)/class/lib/default/System.Xml.dll \ + $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \ + _tmpinst/lib + +tmpinst-full-build: mcs-do-full-build + cp -f $(mcs_topdir)/mcs/mcs.exe \ + $(mcs_topdir)/class/lib/default/mscorlib.dll \ + $(mcs_topdir)/class/lib/default/System.dll \ + $(mcs_topdir)/class/lib/default/System.Xml.dll \ + $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \ + _tmpinst/lib # Build enough of 'mono' to run the stage1 mcs.exe -mono-do-runtime-only: $(CONFIG_HEADER) +mono-do-basic-build: $(CONFIG_HEADER) if test -z "$(libgc_dir)"; then :; else cd libgc && $(MAKE) ; fi cd mono && $(MAKE) -mcs-do-basic-build: - rm -f $(MCS_FILES) - for dir in $(MCS_BASIC_DIRS); do \ - (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \ - done +# Build stripped down versions of 'mcs', 'mscorlib.dll' and 'System.dll' with installed 'mcs' +## remove System.Xml.dll since it's a soft-dependency of System.dll +mcs-do-basic-build: + rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll + rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll + cd $(mcs_topdir)/jay && $(MAKE) + cd $(mcs_topdir)/mcs && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" + cd $(mcs_topdir)/class/corlib && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" + cd $(mcs_topdir)/class/System && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB" mcs-do-short-build: tmpinst=`cd _tmpinst && pwd` ; \ PATH=$$tmpinst/bin:$$PATH; export PATH ; \ - for dir in $(MCS_DIRS); do \ + for dir in jay mcs class/corlib class/System class/System.XML class/System class/Mono.CSharp.Debugger; do \ (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \ done @@ -139,6 +130,24 @@ tmpinst-dir.stamp: Makefile.am tmpinst-dir: tmpinst-dir.stamp @if test -d _tmpinst; then :; else rm -f tmpinst-dir.stamp; $(MAKE) tmpinst-dir.stamp; fi + +# building with monolite + +get-monolite-latest: + wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz + +tmpinst-monolite: tmpinst-dir + -rm -f _tmpinst/lib/mcs.exe _tmpinst/lib/*.dll + -rm -fr _tmpinst/monolite-* + srcdir=`cd $(srcdir) && pwd` && cd _tmpinst && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - ) + mv -f _tmpinst/monolite-*/mcs.exe _tmpinst/monolite-*/*.dll _tmpinst/lib + rm -fr _tmpinst/monolite-* + +monolite-bootstrap: tmpinst-monolite mono-do-basic-build + rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll + rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll Mono.CSharp.Debugger.dll + $(MAKE) two-stage-strap + # Obsolete target -- don't use. .PHONY: fullbuild fullbuild: bootstrap diff --git a/mcs/btests/DelegateA.vb b/mcs/btests/DelegateA.vb deleted file mode 100644 index 53dd2552066..00000000000 --- a/mcs/btests/DelegateA.vb +++ /dev/null @@ -1,36 +0,0 @@ -Imports System - - - -Module M - Delegate Sub SD() - sub f() - End sub - - Public Delegate Function SF(a as integer) as Integer - Public Function f1(a as integer) as Integer - return a - End Function - - Sub Main() - dim d1 as SD - d1 = new SD(AddressOf f) - d1.Invoke() - - 'dim d2 as SD - 'd2 = AddressOf f ''//this invocation is not functional yet - 'd2.Invoke() - - dim d3 as new SD(AddressOf f) - d3.Invoke() - - dim d4 as SF - d4 = new SF(AddressOf f1) - Dim i as Integer = d4.Invoke(10) - if i <> 10 then - Throw new System.Exception ("#A1, Unexpected result") - end if - - - End Sub -End Module diff --git a/mcs/btests/DelegateC1.vb b/mcs/btests/DelegateC1.vb deleted file mode 100644 index 079300b3f4c..00000000000 --- a/mcs/btests/DelegateC1.vb +++ /dev/null @@ -1,14 +0,0 @@ -Imports System - -Module M - Delegate Sub SD() - sub f(i as integer) - End sub - - - Sub Main() - dim d1 as SD - d1= new SD(AddressOf f) - d1.Invoke() - End Sub -End Module diff --git a/mcs/btests/DelegateC2.vb b/mcs/btests/DelegateC2.vb deleted file mode 100644 index b6d27b57abb..00000000000 --- a/mcs/btests/DelegateC2.vb +++ /dev/null @@ -1,18 +0,0 @@ -Imports System - -Module M - Delegate Sub SD() - sub f() - End sub - - Public Delegate Function SF(a as integer) as Integer - Public Function f1(a as integer) as Integer - return a - End Function - - Sub Main() - dim d1 as SD - d1= new SD(AddressOf f1) - d1.Invoke() - End Sub -End Module diff --git a/mcs/btests/Test.Sources b/mcs/btests/Test.Sources index dd863145d10..1f494a1c6bc 100644 --- a/mcs/btests/Test.Sources +++ b/mcs/btests/Test.Sources @@ -132,8 +132,7 @@ PropertyA \ PropertyB \ PropertyC \ PropertyD \ -PropertyE \ -DelegateA +PropertyE # All negetive test cases which should # fail during compilation goes here @@ -282,9 +281,7 @@ EnumC7 \ PropertyC1 \ PropertyC2 \ PropertyC3 \ -PropertyC4 \ -DelegateC1 \ -DelegateC2 +PropertyC4 # All negetive test cases which should fail at # runtime goes here diff --git a/mcs/class/System.Drawing/System.Drawing/Brush.cs b/mcs/class/System.Drawing/System.Drawing/Brush.cs index e37b2f51c14..cf0a32b9cf2 100755 --- a/mcs/class/System.Drawing/System.Drawing/Brush.cs +++ b/mcs/class/System.Drawing/System.Drawing/Brush.cs @@ -18,7 +18,6 @@ namespace System.Drawing public abstract class Brush : MarshalByRefObject, ICloneable, IDisposable { internal IntPtr nativeObject; - internal bool disposed = false; abstract public object Clone (); internal Brush () @@ -64,11 +63,8 @@ namespace System.Drawing protected virtual void Dispose (bool disposing) { - if (disposed == false) { - Status status = GDIPlus.GdipDeleteBrush (nativeObject); - GDIPlus.CheckStatus (status); - disposed = true; - } + Status status = GDIPlus.GdipDeleteBrush (nativeObject); + GDIPlus.CheckStatus (status); } ~Brush () diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog index 4868b5d88e5..c17cd3be05e 100644 --- a/mcs/class/System.Drawing/System.Drawing/ChangeLog +++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog @@ -1,14 +1,3 @@ -2004-06-01 Gert Driesen <drieseng@users.sourceforge.net> - - * Font.cs: Added missing Browsable attribute on SizeInPoints. - * Region.cs: Removed extra ComVisible attribute from Clone(). - -2004-06-01 Ravindra <rkumar@novell.com> - - * Pen.cs: Added a note on Dispose method. - * Brush.cs: Fixed Dispose method. - * SolidBrush.cs: Fixed Dispose method. - 2004-05-28 Ravindra <rkumar@novell.com> * gdipFunctions.cs: Added some P/Invoke calls for Draw/Fill diff --git a/mcs/class/System.Drawing/System.Drawing/Font.cs b/mcs/class/System.Drawing/System.Drawing/Font.cs index 45b191c7b30..0c95de93d5c 100644 --- a/mcs/class/System.Drawing/System.Drawing/Font.cs +++ b/mcs/class/System.Drawing/System.Drawing/Font.cs @@ -382,8 +382,6 @@ namespace System.Drawing { } private float _sizeInPoints; - - [Browsable (false)] public float SizeInPoints { get { return _sizeInPoints; diff --git a/mcs/class/System.Drawing/System.Drawing/Pen.cs b/mcs/class/System.Drawing/System.Drawing/Pen.cs index cd814cfcb32..ffaa8a3696e 100755 --- a/mcs/class/System.Drawing/System.Drawing/Pen.cs +++ b/mcs/class/System.Drawing/System.Drawing/Pen.cs @@ -421,18 +421,14 @@ namespace System.Drawing { void Dispose (bool disposing) { - // Pen is disposed if and only if it is not disposed and - // it is modifiable OR it is not disposed and it is being - // collected by GC. - if (! disposed) { - if (isModifiable || disposing == false) { - Status status = GDIPlus.GdipDeletePen (nativeObject); - GDIPlus.CheckStatus (status); - disposed = true; - } - else - throw new ArgumentException ("This Pen object can't be modified."); + // Let the GC collect it + if ((disposed == false) && (isModifiable || disposing == false)) { + Status status = GDIPlus.GdipDeletePen (nativeObject); + GDIPlus.CheckStatus (status); + disposed = true; } + else + throw new ArgumentException ("This Pen object can't be modified."); } ~Pen () diff --git a/mcs/class/System.Drawing/System.Drawing/Region.cs b/mcs/class/System.Drawing/System.Drawing/Region.cs index 38d8c3a5289..1de0da3623f 100644 --- a/mcs/class/System.Drawing/System.Drawing/Region.cs +++ b/mcs/class/System.Drawing/System.Drawing/Region.cs @@ -504,6 +504,7 @@ namespace System.Drawing GDIPlus.CheckStatus (status); } + [ComVisible (false)] public Region Clone() { IntPtr cloned; diff --git a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs index 43224f3a703..ffb629b8bfb 100644 --- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs +++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs @@ -63,18 +63,13 @@ namespace System.Drawing protected override void Dispose (bool disposing) { - // SolidBrush is disposed if and only if it is not disposed - // and it is modifiable OR it is not disposed and it is being - // collected by GC. - if (! disposed) { - if (isModifiable || disposing == false) { - Status status = GDIPlus.GdipDeleteBrush (nativeObject); - GDIPlus.CheckStatus (status); - disposed = true; - } - else - throw new ArgumentException ("This SolidBrush object can't be modified."); + // Let the GC collect it + if (isModifiable || disposing == false) { + Status status = GDIPlus.GdipDeleteBrush (nativeObject); + GDIPlus.CheckStatus (status); } + else + throw new ArgumentException ("This SolidBrush object can't be modified."); } } } diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog index 71d17ed5213..dcf94688f26 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog +++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog @@ -1,7 +1,3 @@ -2004-06-01 Gert Driesen <drieseng@users.sourceforge.net> - - * WebServicesConfigurationSectionHandler.cs: removed unused variables - 2004-02-05 Alon Gazit <along@mainsoft.com> * XmlFormatExtensionAttribute.cs: diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs index 5f92aa7ab2f..f8eb5badd98 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs @@ -346,6 +346,7 @@ namespace System.Web.Services.Configuration ThrowException ("Only elements allowed", child); string name = child.Name; + string error; if (name == "add") { string seType = AttValue ("type", child, false); string priority = AttValue ("priority", child); @@ -389,6 +390,7 @@ namespace System.Web.Services.Configuration ThrowException ("Only elements allowed", child); string name = child.Name; + string error; if (name == "add") { string typeName = AttValue ("name", child, false); if (child.Attributes != null && child.Attributes.Count != 0) diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs index 927c6bf977c..12cdf0cfbbb 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs @@ -40,7 +40,7 @@ namespace System.Web.Services.Description { #region Properties
-// [XmlIgnore]
+ [XmlIgnore]
public ServiceDescriptionFormatExtensionCollection Extensions {
get { return extensions; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog index b21f315789d..0cddf75adb2 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog @@ -1,25 +1,3 @@ -2004-06-01 Gert Driesen <drieseng@users.sourceforge.net> - - * Binding.cs: removed extra XmlIgnore attribute on ServiceDescription - * Import.cs: removed extra XmlIgnore attribute on ServiceDescription - * Message.cs: removed extra XmlIgnore attribute on ServiceDescription - * MessageBinding.cs: removed extra DefaultValue attribute from Name, - removed extra XmlIgnoreAttribute from OperationBinding - * MessagePart.cs: removed extra XmlIgnore attribute on Message - * MimeContentBinding.cs: removed extra DefaultValue attribute on Part - * Operation.cs: removed extra XmlIgnore attribute on PortType - * OperationBinding.cs: removed extra XmlIgnore attribute on Binding - * OperationMessage.cs: removed extra XmlIgnore attribute on Operation - * Port.cs: removed extra XmlIgnore attribute on Service - * PortType.cs: removed extra XmlIgnore on ServiceDescription - * Service.cs: removed extra XmlIgnore on ServiceDescription - * ServiceDescriptionFormatExtension.cs: removed extra XmlIgnore - attribute on Parent - * SoapHeaderBinding.cs: added XmlElement attribute on Fault - * HttpSimpleProtocolImporter.cs: removed unused variable - * ServiceDescriptionImporter.cs: removed unused variable - * SoapProtocolImporter.cs: removed unused variable - 2004-05-25 Lluis Sanchez Gual <lluis@ximian.com> * BindingCollection.cs: Fixed this[string] property. diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpSimpleProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpSimpleProtocolImporter.cs index fdbcdd5f4e1..5016e042a7a 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpSimpleProtocolImporter.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpSimpleProtocolImporter.cs @@ -118,6 +118,7 @@ namespace System.Web.Services.Description XmlMembersMapping ImportInMembersMapping (Message msg) { + XmlQualifiedName elem = null; SoapSchemaMember[] mems = new SoapSchemaMember [msg.Parts.Count]; for (int n=0; n<mems.Length; n++) { diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs index ec8bcf4f4cc..b50abaa961c 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs @@ -45,7 +45,7 @@ namespace System.Web.Services.Description { set { ns = value; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public ServiceDescription ServiceDescription {
get { return serviceDescription; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs index 851ee1b66f9..3f933f93850 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs @@ -46,7 +46,7 @@ namespace System.Web.Services.Description { get { return parts; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public ServiceDescription ServiceDescription {
get { return serviceDescription; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs index 181664f6dad..6a64ca745e8 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs @@ -37,14 +37,14 @@ namespace System.Web.Services.Description { get;
}
-// [DefaultValue (null)]
+ [DefaultValue (null)]
[XmlAttribute ("name", DataType = "NMTOKEN")]
public string Name {
get { return name; }
set { name = value; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public OperationBinding OperationBinding {
get { return operationBinding; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs index f4e21c18624..5116d066300 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs @@ -42,7 +42,7 @@ namespace System.Web.Services.Description { set { element = value; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public Message Message {
get { return message; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs index b7cae679276..675d29ab26c 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs @@ -73,7 +73,7 @@ namespace System.Web.Services.Description { set { ParameterOrder = value.Split (' '); }
}
-// [XmlIgnore]
+ [XmlIgnore]
public PortType PortType {
get { return portType; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs index c8c70bf058c..0c6c746f078 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs @@ -40,7 +40,7 @@ namespace System.Web.Services.Description { #region Properties
-// [XmlIgnore]
+ [XmlIgnore]
public Binding Binding {
get { return binding; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs index f559053a1f1..b61309920db 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs @@ -47,7 +47,7 @@ namespace System.Web.Services.Description { set { name = value; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public Operation Operation {
get { return operation; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs index a3b2383aede..f297facb749 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs @@ -55,7 +55,7 @@ namespace System.Web.Services.Description { set { name = value; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public Service Service {
get { return service; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs index 14be6f58ca0..c0abf7d44db 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs @@ -44,7 +44,7 @@ namespace System.Web.Services.Description { get { return operations; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public ServiceDescription ServiceDescription {
get { return serviceDescription; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs index d4d9580b95c..53fd9c61788 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs @@ -51,7 +51,7 @@ namespace System.Web.Services.Description { get { return ports; }
}
-// [XmlIgnore]
+ [XmlIgnore]
public ServiceDescription ServiceDescription {
get { return serviceDescription; }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs index 3bbdc9d0575..b2fa982536e 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs @@ -87,6 +87,7 @@ namespace System.Web.Services.Description { public ServiceDescriptionImportWarnings Import (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)
{
+ ServiceDescriptionImportWarnings warns = 0;
ProtocolImporter importer = GetImporter ();
if (!importer.Import (this, codeNamespace, codeCompileUnit, importInfo))
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs index 8959def4f68..a8f6e46eea6 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs @@ -85,7 +85,6 @@ namespace System.Web.Services.Description { #if NET_1_1
[MonoTODO]
- [XmlElement ("headerfault")]
public SoapHeaderFaultBinding Fault
{
get { return null; }
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs index 833d32fffd1..1c1175aaa16 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs @@ -212,6 +212,7 @@ namespace System.Web.Services.Description { XmlMembersMapping ImportMembersMapping (Message msg, SoapBodyBinding sbb, SoapBindingStyle style, bool output) { + XmlQualifiedName elem = null; string elemName = Operation.Name; if (output) elemName += "Response"; diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog index 79a54ce4db5..522889fd6e9 100755 --- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog +++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog @@ -1,7 +1,3 @@ -2004-06-01 Gert Driesen <drieseng@users.sourceforge.net> - - * DiscoveryReference.cs: Added missing XmlIgnore attribute. - 2004-05-24 Lluis Sanchez Gual <lluis@ximian.com> * ContractReference.cs: convert relative import uris to absolute uris. diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs index a5ab440db19..1187e5abfb4 100755 --- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs @@ -38,7 +38,6 @@ namespace System.Web.Services.Discovery { }
- [XmlIgnore]
public virtual string DefaultFilename {
get { return FilenameFromUrl (Url); }
}
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog index 70a0dc52be9..2164df727cd 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog +++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog @@ -1,8 +1,3 @@ -2004-06-01 Gert Driesen <drieseng@users.sourceforge.net> - - * HttpSoapWebServiceHandler.cs: Removed unused variables. - * SoapHeaderAttribute.cs: Added Obsolete attribute. - 2004-05-24 Lluis Sanchez Gual <lluis@ximian.com> * SoapClientMessage.cs: Get the MethodInfo from the corresponding diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs index 2c4d0c8dde5..00dd2bbec8c 100755 --- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSoapWebServiceHandler.cs @@ -301,6 +301,10 @@ namespace System.Web.Services.Protocols SoapException soex = ex as SoapException; if (soex == null) soex = new SoapException (ex.Message, SoapException.ServerFaultCode, ex); + MethodStubInfo stubInfo; + object server; + Stream stream; + SoapServerMessage faultMessage; if (requestMessage != null) faultMessage = new SoapServerMessage (context.Request, soex, requestMessage.MethodStubInfo, requestMessage.Server, requestMessage.Stream); diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs index a1d48c83e73..51b9c176a72 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs @@ -42,11 +42,6 @@ namespace System.Web.Services.Protocols { set { memberName = value; }
}
-#if NET_1_1
- [Obsolete ("This property will be removed from a future"
- + " version. The presence of a particular header"
- + " in a SOAP message is no longer enforced", false)]
-#endif
public bool Required {
get { return required; }
set { required = value; }
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog index 73829845960..86e8e823ab6 100644 --- a/mcs/class/System.Web/System.Web/ChangeLog +++ b/mcs/class/System.Web/System.Web/ChangeLog @@ -1,8 +1,3 @@ -2004-06-01 Gonzalo Paniagua Javier <gonzalo@ximian.com> - - * HttpWorkerRequest.cs: the hashtables are now case-insensitive. Thanks - to Markus Kräutner. - 2004-05-31 Gonzalo Paniagua Javier <gonzalo@ximian.com> * HttpRequest.cs: nullify _sRequestRootVirtualDir and baseVirtualDir diff --git a/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs index 6f383fd11f7..7e7abe887c7 100644 --- a/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs +++ b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs @@ -11,7 +11,6 @@ // using System; using System.Collections; -using System.Globalization; using System.Runtime.InteropServices; namespace System.Web @@ -173,12 +172,8 @@ namespace System.Web s_HttpResponseHeaderNames = new string [30]; // Lookup tables (name -> id) - CaseInsensitiveHashCodeProvider hprovider; - hprovider = new CaseInsensitiveHashCodeProvider (CultureInfo.InvariantCulture); - CaseInsensitiveComparer hcomparer; - hcomparer = new CaseInsensitiveComparer (CultureInfo.InvariantCulture); - s_HttpRequestHeaderTable = new Hashtable (hprovider, hcomparer); - s_HttpResponseHeadersTable = new Hashtable (hprovider, hcomparer); + s_HttpRequestHeaderTable = new Hashtable (); + s_HttpResponseHeadersTable = new Hashtable (); AddHeader (true, true, 0, "Cache-Control"); AddHeader (true, true, 1, "Connection"); diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog index 5d9343da211..181406cfcde 100644 --- a/mcs/class/System/System.Text.RegularExpressions/ChangeLog +++ b/mcs/class/System/System.Text.RegularExpressions/ChangeLog @@ -1,11 +1,5 @@ 2004-06-01 Gonzalo Paniagua Javier <gonzalo@ximian.com> - * syntax.cs: re-applied my patch from 2004-05-27 plus a fix which is - emitting a Category.All if both a category and its negated value are - present. - -2004-06-01 Gonzalo Paniagua Javier <gonzalo@ximian.com> - * syntax.cs: reverting my previous patch. It causes bigger problems. 2004-05-27 Gonzalo Paniagua Javier <gonzalo@ximian.com> diff --git a/mcs/class/System/System.Text.RegularExpressions/syntax.cs b/mcs/class/System/System.Text.RegularExpressions/syntax.cs index 3203143f14c..ed02509572a 100644 --- a/mcs/class/System/System.Text.RegularExpressions/syntax.cs +++ b/mcs/class/System/System.Text.RegularExpressions/syntax.cs @@ -773,9 +773,14 @@ namespace System.Text.RegularExpressions.Syntax { // initialize pos/neg category arrays - int cat_size = (int) Category.LastValue; - pos_cats = new BitArray (cat_size); - neg_cats = new BitArray (cat_size); + Array cat_values = Enum.GetValues (typeof (Category)); + int cat_size = (int)(Category)cat_values.GetValue (cat_values.Length - 1) + 1; + pos_cats = new bool[cat_size]; + neg_cats = new bool[cat_size]; + for (int i = 0; i < cat_size; ++ i) { + pos_cats[i] = false; + neg_cats[i] = false; + } } public CharacterClass (Category cat, bool negate) : this (false, false) { @@ -796,8 +801,15 @@ namespace System.Text.RegularExpressions.Syntax { int n = (int)cat; if (negate) { + if (pos_cats[n]) + pos_cats[n] = false; + neg_cats[n] = true; - } else { + } + else { + if (neg_cats[n]) + neg_cats[n] = false; + pos_cats[n] = true; } } @@ -864,14 +876,10 @@ namespace System.Text.RegularExpressions.Syntax { // emit categories for (int i = 0; i < pos_cats.Length; ++ i) { - if (pos_cats[i]) { - if (neg_cats [i]) - cmp.EmitCategory (Category.Any, negate, reverse); - else - cmp.EmitCategory ((Category)i, negate, reverse); - } else if (neg_cats[i]) { + if (pos_cats[i]) + cmp.EmitCategory ((Category)i, negate, reverse); + else if (neg_cats[i]) cmp.EmitCategory ((Category)i, !negate, reverse); - } } // emit character/range/sets from meta-collection @@ -930,7 +938,7 @@ namespace System.Text.RegularExpressions.Syntax { private static Interval upper_case_characters = new Interval ((char)65, (char)90); private const int distance_between_upper_and_lower_case = 32; private bool negate, ignore; - private BitArray pos_cats, neg_cats; + private bool[] pos_cats, neg_cats; private IntervalCollection intervals; } diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog index 68f9949008f..11f56f49b72 100644 --- a/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog +++ b/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog @@ -1,7 +1,3 @@ -2004-06-01 Gonzalo Paniagua Javier <gonzalo@ximian.com> - - * RegexBugs.cs: added CategoryAndNegated test. - 2004-05-27 Gonzalo Paniagua Javier <gonzalo@ximian.com> * RegexBugs.cs: added tests from bug #59150. diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs index 9e1214fdd43..e65648542f5 100644 --- a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs +++ b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs @@ -193,16 +193,6 @@ namespace MonoTests.System.Text.RegularExpressions Match m = re.Match (new string ('1', 33)); AssertEquals ("#01", true, m.Success); } - - [Test] - public void CategoryAndNegated () // Was a regression after first attemp to fix 59150. - { - string text = "<?xml version=\"1.0\"?>"; - Regex re = new Regex ("<\\s*(\\/?)\\s*([\\s\\S]*?)\\s*(\\/?)\\s*>"); - text = re.Replace (text, "{blue:<$1}{maroon:$2}{blue:$3>}"); - AssertEquals ("#01", "{blue:<}{maroon:?xml version=\"1.0\"?}{blue:>}", text); - } - } } diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog index 7ce3e96b34a..637d306a004 100644 --- a/mcs/class/corlib/System.Collections/ChangeLog +++ b/mcs/class/corlib/System.Collections/ChangeLog @@ -1,11 +1,3 @@ -2004-06-01 Sebastien Pouliot <sebastien@ximian.com> - - * SortedList.cs: Fixed case where the initial capacity was set to 0. - -2004-05-31 Sebastien Pouliot <sebastien@ximian.com> - - * Hashtable.cs: Added ArgumentNullException in GetObjectData. - 2004-05-29 Gonzalo Paniagua Javier <gonzalo@ximian.com> * ChangeLog: diff --git a/mcs/class/corlib/System.Collections/Hashtable.cs b/mcs/class/corlib/System.Collections/Hashtable.cs index 4e5d97dbdc8..87ff1fd77e5 100644 --- a/mcs/class/corlib/System.Collections/Hashtable.cs +++ b/mcs/class/corlib/System.Collections/Hashtable.cs @@ -431,9 +431,6 @@ namespace System.Collections { public virtual void GetObjectData (SerializationInfo info, StreamingContext context) { - if (info == null) - throw new ArgumentNullException ("info"); - info.AddValue ("LoadFactor", loadFactor); info.AddValue ("Version", modificationCount); info.AddValue ("Comparer", comparerRef); diff --git a/mcs/class/corlib/System.Collections/SortedList.cs b/mcs/class/corlib/System.Collections/SortedList.cs index 074d6f38d7b..2c0e4c1342e 100644 --- a/mcs/class/corlib/System.Collections/SortedList.cs +++ b/mcs/class/corlib/System.Collections/SortedList.cs @@ -37,14 +37,12 @@ namespace System.Collections { private int inUse;
private int modificationCount;
private Slot[] table;
- private IComparer comparer; - private int defaultCapacity;
+ private IComparer comparer;
//
// Constructors
//
- public SortedList () - : this (null, INITIAL_SIZE)
+ public SortedList () : this (INITIAL_SIZE)
{
}
@@ -56,12 +54,7 @@ namespace System.Collections { public SortedList (IComparer comparer, int initialCapacity)
{
if (initialCapacity < 0)
- throw new ArgumentOutOfRangeException ("initialCapacity"); - - if (initialCapacity == 0) - defaultCapacity = 0; - else - defaultCapacity = INITIAL_SIZE;
+ throw new ArgumentOutOfRangeException();
this.comparer = comparer;
InitTable (initialCapacity, true);
@@ -181,13 +174,13 @@ namespace System.Collections { } else if (value == 0) { // return to default size - Slot [] newTable = new Slot [defaultCapacity]; + Slot [] newTable = new Slot [INITIAL_SIZE];
Array.Copy (table, newTable, inUse);
this.table = newTable;
} #if NET_1_0 - else if (current > defaultCapacity && value < current) { - Slot [] newTable = new Slot [defaultCapacity];
+ else if (current > INITIAL_SIZE && value < current) { + Slot [] newTable = new Slot [INITIAL_SIZE];
Array.Copy (table, newTable, inUse);
this.table = newTable;
} @@ -226,9 +219,8 @@ namespace System.Collections { public virtual void Clear ()
- { - defaultCapacity = INITIAL_SIZE;
- this.table = new Slot [defaultCapacity];
+ {
+ this.table = new Slot [INITIAL_SIZE];
inUse = 0;
modificationCount++;
}
@@ -426,7 +418,7 @@ namespace System.Collections { // of the SortedList to the default capacity,
// not zero.
if (Count == 0)
- Resize (defaultCapacity, false);
+ Resize (INITIAL_SIZE, false);
else
Resize (Count, true);
}
@@ -534,10 +526,8 @@ namespace System.Collections { InitTable (capacity, false);
}
- private void InitTable (int capacity, bool forceSize) - {
- if (!forceSize && (capacity < defaultCapacity)) - capacity = defaultCapacity;
+ private void InitTable (int capacity, bool forceSize) {
+ if (!forceSize && (capacity < INITIAL_SIZE)) capacity = INITIAL_SIZE;
this.table = new Slot [capacity];
this.inUse = 0;
this.modificationCount = 0;
diff --git a/mcs/class/corlib/System.Reflection/common.src b/mcs/class/corlib/System.Reflection/common.src deleted file mode 100644 index 022b6768fcc..00000000000 --- a/mcs/class/corlib/System.Reflection/common.src +++ /dev/null @@ -1,25 +0,0 @@ -Assembly.cs -AssemblyNameFlags.cs -BindingFlags.cs -CallingConventions.cs -ConstructorInfo.cs -DefaultMemberAttribute.cs -EventAttributes.cs -EventInfo.cs -FieldAttributes.cs -FieldInfo.cs -ICustomAttributeProvider.cs -MemberFilter.cs -MemberInfo.cs -MemberTypes.cs -MethodAttributes.cs -MethodBase.cs -MethodImplAttributes.cs -MethodInfo.cs -Module.cs -ParameterAttributes.cs -PropertyAttributes.cs -PropertyInfo.cs -ResourceAttributes.cs -ResourceLocation.cs -TypeAttributes.cs diff --git a/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs index 7174634ad5e..9c257846f3b 100644 --- a/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs +++ b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs @@ -418,14 +418,6 @@ public class ArrayListTest : Assertion { al.BinarySearch (1, Int32.MaxValue, this, null);
}
- [Test]
- public void BinarySearch_Null ()
- {
- ArrayList al = new ArrayList ();
- al.Add (this);
- AssertEquals ("null", -1, al.BinarySearch (null));
- }
-
// TODO - BinarySearch with IComparer
public void TestClear() {
diff --git a/mcs/class/corlib/Test/System.Collections/ChangeLog b/mcs/class/corlib/Test/System.Collections/ChangeLog index 5576f79e527..1c7e4958359 100644 --- a/mcs/class/corlib/Test/System.Collections/ChangeLog +++ b/mcs/class/corlib/Test/System.Collections/ChangeLog @@ -1,14 +1,3 @@ -2004-06-01 Sebastien Pouliot <sebastien@ximian.com> - - * SortedListTest.cs: Added new test when initial capacity is set to 0 - (so it never returns to default, 16, when Capacity is set to 0) unless - Clear is called. Cleaned up unused SetUp/TearDown. - -2004-05-31 Sebastien Pouliot <sebastien@ximian.com> - - * ArrayListTest.cs: Added new test for null in BinarySearch. - * HashtableTest.cs: Added null checking fro GetObjectData. - 2004-05-27 Sebastien Pouliot <sebastien@ximian.com> * HashtableTest.cs: Added case where a cloned hashtable must also be diff --git a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs index f05c15c831f..f883779af8e 100644 --- a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs +++ b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs @@ -778,13 +778,5 @@ public class HashtableTest : Assertion { Assert (!e.MoveNext ());
}
-
- [Test]
- [ExpectedException (typeof (ArgumentNullException))]
- public void GetObjectData_NullSerializationInfo ()
- {
- SetDefaultData ();
- ht.GetObjectData (null, new StreamingContext ());
- }
}
}
diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs index f025995129f..7b4aba89f77 100755 --- a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs +++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs @@ -21,6 +21,8 @@ using NUnit.Framework; namespace MonoTests.System.Collections {
+
+/// <summary>SortedList test.</summary>
[TestFixture]
public class SortedListTest : Assertion {
protected SortedList sl1;
@@ -28,6 +30,16 @@ public class SortedListTest : Assertion { protected SortedList emptysl;
protected const int icap=16;
+ [SetUp]
+ public void SetUp()
+ {
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ }
+
public void TestConstructor1() {
SortedList temp1 = new SortedList();
AssertNotNull("sl.constructor-1: returns null", temp1);
@@ -103,24 +115,6 @@ public class SortedListTest : Assertion { } catch (ArgumentOutOfRangeException) {}
}
- [Test]
- public void Constructor_Capacity ()
- {
- SortedList sl = new SortedList (0);
- AssertEquals ("Capacity-Original", 0, sl.Capacity);
- sl.Capacity = 0;
- // doesn't reset to class default (16)
- AssertEquals ("Capacity-Resetted", 0, sl.Capacity);
-
- for (int i=1; i <= 16; i++) {
- sl = new SortedList (i);
- AssertEquals ("Capacity-Original" + i.ToString (), i, sl.Capacity);
- sl.Capacity = 0;
- // reset to class default (16)
- AssertEquals ("Capacity-Resetted" + i.ToString (), 16, sl.Capacity);
- }
- }
-
[Test]
public void TestIsSynchronized() {
SortedList sl1 = new SortedList();
@@ -308,32 +302,6 @@ public class SortedListTest : Assertion { AssertEquals("sl.Clear: capacity is altered", 16, sl1.Capacity);
}
- [Test]
- public void Clear_Capacity ()
- {
- // strangely Clear change the default capacity (while Capacity doesn't)
- for (int i=0; i <= 16; i++) {
- SortedList sl = new SortedList (i);
- AssertEquals ("Capacity-Original" + i.ToString (), i, sl.Capacity);
- sl.Clear ();
- // reset to class default (16)
- AssertEquals ("Capacity-Resetted" + i.ToString (), 16, sl.Capacity);
- }
- }
-
- [Test]
- public void Clear_Capacity_Reset ()
- {
- SortedList sl = new SortedList (0);
- AssertEquals ("0", 0, sl.Capacity);
- sl.Clear ();
- // reset to class default (16)
- AssertEquals ("Clear", 16, sl.Capacity);
- sl.Capacity = 0;
- AssertEquals ("Capacity", 16, sl.Capacity);
- // note: we didn't return to 0 - so Clear cahnge the default capacity
- }
-
[Test]
public void TestClone() {
{
diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog index 4def9b5fad8..59e9e3a5172 100644 --- a/mcs/class/corlib/Test/System.IO/ChangeLog +++ b/mcs/class/corlib/Test/System.IO/ChangeLog @@ -1,11 +1,3 @@ -2004-05-31 Sebastien Pouliot <sebastien@ximian.com> - - * FileTest.cs: Added tests to confirm that Exists never throws - exceptions even for invalid filenames or for unexisting directories. - * PathTest.cs: Added windows-specific tests that shows that - ChangeExtension validate the input patch but doesn't validate the - resulting path. - 2004-05-30 Sebastien Pouliot <sebastien@ximian.com> * BufferedStreamTest.cs: Added tests for Position after SetLength, diff --git a/mcs/class/corlib/Test/System.IO/FileTest.cs b/mcs/class/corlib/Test/System.IO/FileTest.cs index 21f11655f87..816ac079bda 100644 --- a/mcs/class/corlib/Test/System.IO/FileTest.cs +++ b/mcs/class/corlib/Test/System.IO/FileTest.cs @@ -65,18 +65,8 @@ namespace MonoTests.System.IO s.Close (); DeleteFile (path); } - } - - [Test] - public void Exists_InvalidFileName () - { - Assert ("><|", !File.Exists ("><|")); - } - - [Test] - public void Exists_InvalidDirectory () - { - Assert ("InvalidDirectory", !File.Exists (Path.Combine ("does not exist", "file.txt"))); + + } [Test] diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs index 8dac32d17f0..4d23ef35fb2 100644 --- a/mcs/class/corlib/Test/System.IO/PathTest.cs +++ b/mcs/class/corlib/Test/System.IO/PathTest.cs @@ -129,22 +129,14 @@ namespace MonoTests.System.IO AssertEquals ("ChangeExtension #17", String.Empty, testPath); testPath = Path.ChangeExtension (null, null); AssertNull ("ChangeExtension #18", testPath); - } - - [Test] - [ExpectedException (typeof (ArgumentException))] - public void ChangeExtension_BadPath () - { - if (!Windows) throw new ArgumentException ("Test Only On Windows"); - Path.ChangeExtension ("<", ".extension"); - } - [Test] - public void ChangeExtension_BadExtension () - { if (Windows) { - string fn = Path.ChangeExtension ("file.ext", "<"); - AssertEquals ("Invalid filename", "file.<", fn); + try { + testPath = Path.ChangeExtension ("<", ".extension"); + Fail ("ChangeException Fail #01"); + } catch (Exception e) { + AssertEquals ("ChangeExtension Exc. #01", typeof (ArgumentException), e.GetType ()); + } } } diff --git a/mcs/class/corlib/Test/System/ArrayTest.cs b/mcs/class/corlib/Test/System/ArrayTest.cs index a5b17bf1a97..a10305286d7 100644 --- a/mcs/class/corlib/Test/System/ArrayTest.cs +++ b/mcs/class/corlib/Test/System/ArrayTest.cs @@ -203,22 +203,6 @@ public class ArrayTest : Assertion AssertEquals("#B30", 49, Array.BinarySearch(array, 10)); } - [Test] - public void BinarySearch_NullValue () - { - int[] array = new int[1]; - AssertEquals ("I=a,o", -1, Array.BinarySearch (array, null)); - AssertEquals ("I=a,o,c", -1, Array.BinarySearch (array, null, null)); - AssertEquals ("I=a,i,i,o", -1, Array.BinarySearch (array, 0, 1, null)); - AssertEquals ("I=a,i,i,o,c", -1, Array.BinarySearch (array, 0, 1, null,null)); - - object[] o = new object [3] { this, this, null }; - AssertEquals ("O=a,o", -1, Array.BinarySearch (o, null)); - AssertEquals ("O=a,o,c", -1, Array.BinarySearch (o, null, null)); - AssertEquals ("O=a,i,i,o", -1, Array.BinarySearch (o, 0, 3, null)); - AssertEquals ("O=a,i,i,o,c", -1, Array.BinarySearch (o, 0, 3, null, null)); - } - // TODO - testBinarySearch with explicit IComparer args [Test] diff --git a/mcs/class/corlib/Test/System/ByteTest.cs b/mcs/class/corlib/Test/System/ByteTest.cs index 6a0abcf77e4..10a3b9eb7d9 100644 --- a/mcs/class/corlib/Test/System/ByteTest.cs +++ b/mcs/class/corlib/Test/System/ByteTest.cs @@ -216,17 +216,6 @@ public class ByteTest : Assertion } } - - [Test] - public void ToString_Default () - { - byte value = 255; - string def = value.ToString ("G"); - string format = null; - AssertEquals ("null", def, value.ToString (format)); - format = String.Empty; - AssertEquals ("empty", def, value.ToString (format)); - } } } diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog index 83c9881b919..f8eeaed8be7 100644 --- a/mcs/class/corlib/Test/System/ChangeLog +++ b/mcs/class/corlib/Test/System/ChangeLog @@ -1,8 +1,3 @@ -2004-05-30 Sebastien Pouliot <sebastien@ximian.com> - - * ArrayTest.cs: Added tests for null values in BinarySearch. - * Byte.cs: Added test for default ToString format value. - 2004-05-30 David Sheldon <dave-mono@earth.li> * DecimalTest.cs: Moved the rounding test that fails due to diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog index 0e234387a5a..36972eb3373 100644 --- a/mcs/errors/ChangeLog +++ b/mcs/errors/ChangeLog @@ -1,9 +1,3 @@ -2004-06-01 Marek Safar <marek.safar@seznam.cz> - - * cs1555.cs, - * cs1556.cs, - * cs3000.cs: 3 new error tests. - 2004-05-30 Marek Safar <marek.safar@seznam.cz> * cs1017.cs: New test. diff --git a/mcs/errors/cs1555.cs b/mcs/errors/cs1555.cs deleted file mode 100644 index c4f39fde691..00000000000 --- a/mcs/errors/cs1555.cs +++ /dev/null @@ -1,10 +0,0 @@ -// cs1555.cs: Could not find 'DoesNotExist' specified for Main method -// Line: 0 -// Compiler options: -main:DoesNotExist - -public class MainTest -{ - public static void Main (string[] args) - { - } -}
\ No newline at end of file diff --git a/mcs/errors/cs1556.cs b/mcs/errors/cs1556.cs deleted file mode 100644 index 12fecd0892a..00000000000 --- a/mcs/errors/cs1556.cs +++ /dev/null @@ -1,8 +0,0 @@ -// cs1555.cs: 'MainTest' specified for Main method must be a valid class or struct -// Line: 0 -// Compiler options: -main:MainTest - -public interface MainTest -{ - void Main (string[] args); -} diff --git a/mcs/errors/cs3000.cs b/mcs/errors/cs3000.cs deleted file mode 100644 index 7229611445f..00000000000 --- a/mcs/errors/cs3000.cs +++ /dev/null @@ -1,13 +0,0 @@ -// cs3000.cs: Methods with variable arguments are not CLS-compliant -// Line: 10 - -using System; - -[assembly: CLSCompliant (true)] - -public class M -{ - public void Method (__arglist) - { - } -}
\ No newline at end of file |