[Cleanup] Removed TARGET_JVM
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Thu, 7 Aug 2014 19:09:54 +0000 (21:09 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Fri, 8 Aug 2014 01:28:34 +0000 (03:28 +0200)
It was once part of a special Java target profile, but this is no longer used today.

342 files changed:
mcs/class/Accessibility/Assembly/AssemblyInfo.cs
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/RespExtensionSet.cs
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/SupportClass.cs
mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
mcs/class/System.Configuration/System.Configuration/ConfigurationSection.cs
mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
mcs/class/System.Configuration/Test/Util/TestUtil.cs
mcs/class/System.Core/System.Linq.Expressions/Expression.cs
mcs/class/System.Core/Test/System.Collections.Generic/HashSetTest.cs
mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs
mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DatabaseSerializer.cs
mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandTimeout.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DsSt.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_2.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_GetFillParameters.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Ds.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_DsStr.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dt.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetName_I.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_NextResult.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_ctor.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype.cs
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Rollback.cs
mcs/class/System.Data/Assembly/AssemblyInfo.cs
mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
mcs/class/System.Data/System.Data.Common/DbCommandSet.cs
mcs/class/System.Data/System.Data.Common/DbConnection.cs
mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
mcs/class/System.Data/System.Data.Common/DbParameter.cs
mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs
mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs
mcs/class/System.Data/System.Data.Common/DbTable.cs
mcs/class/System.Data/System.Data.Common/DbTransaction.cs
mcs/class/System.Data/System.Data.Common/SchemaLocation.cs
mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs
mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs
mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs
mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
mcs/class/System.Data/System.Data/ConflictOption.cs
mcs/class/System.Data/System.Data/ConflictOptions.cs
mcs/class/System.Data/System.Data/FillOptions.cs
mcs/class/System.Data/System.Data/UpdateOptions.cs
mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs
mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlByteTest.cs
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt16Test.cs
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt64Test.cs
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs
mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs
mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs
mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs
mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs
mcs/class/System.Data/Test/System.Data/DataTableTest.cs
mcs/class/System.Data/Test/System.Data/DataViewTest.cs
mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs
mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
mcs/class/System.Drawing/System.Drawing.Design/UITypeEditor.cs
mcs/class/System.Drawing/System.Drawing.Drawing2D/Blend.cs
mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs
mcs/class/System.Drawing/System.Drawing.Imaging/ColorMap.cs
mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs
mcs/class/System.Drawing/System.Drawing.Imaging/ColorPalette.cs
mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameters.cs
mcs/class/System.Drawing/System.Drawing.Imaging/MetafileHeader.cs
mcs/class/System.Drawing/System.Drawing/Color.cs
mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
mcs/class/System.Drawing/System.Drawing/FontConverter.cs
mcs/class/System.Drawing/System.Drawing/Rectangle.cs
mcs/class/System.Drawing/System.Drawing/RectangleF.cs
mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTest.cs
mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs
mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs
mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs
mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs
mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs
mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs
mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestRegion.cs
mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs
mcs/class/System.Drawing/Test/System.Drawing/TestStringFormat.cs
mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs
mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptBehaviorDescriptorTest.cs
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptComponentDescriptorTest.cs
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptControlDescriptorTest.cs
mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs
mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionCollection.cs
mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionSerializerBase2.cs
mcs/class/System.Web.Services/System.Web.Services.Description/SoapTransportImporter.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/TypeStubManager.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
mcs/class/System.Web/Assembly/AssemblyInfo.cs
mcs/class/System.Web/System.Web.Configuration_2.0/CompilationSection.cs
mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs
mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
mcs/class/System.Web/System.Web.UI/IScriptManager.cs
mcs/class/System.Web/System.Web.UI/MasterPage.cs
mcs/class/System.Web/System.Web.UI/Page.cs
mcs/class/System.Web/System.Web/BaseParamsCollection.cs
mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
mcs/class/System.Web/System.Web/HttpApplication.cs
mcs/class/System.Web/System.Web/HttpContext.cs
mcs/class/System.Web/System.Web/HttpRequest.cs
mcs/class/System.Web/System.Web/HttpResponse.cs
mcs/class/System.Web/System.Web/HttpResponseStream.cs
mcs/class/System.Web/System.Web/HttpRuntime.cs
mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
mcs/class/System.Web/System.Web/HttpWriter.cs
mcs/class/System.Web/System.Web/SiteMap.cs
mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
mcs/class/System.Web/System.Web/StaticFileHandler.cs
mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/CreateUserWizardTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/DataBoundControlTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/SessionParameterTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceDerbyTest.cs [deleted file]
mcs/class/System.Web/Test/System.Web.UI.WebControls/TableRowTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
mcs/class/System.Web/Test/System.Web.UI/PageTest.cs
mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
mcs/class/System.Web/Test/System.Web/HttpServerUtilityTest.cs
mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
mcs/class/System.Web/Test/System.Web/HttpWorkerRequestTest.cs
mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlWeb.cs
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/tools.cs
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyHost.jvm.cs
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/PageInvoker.cs
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
mcs/class/System.XML/Assembly/AssemblyInfo.cs
mcs/class/System.XML/Mono.Xml.Xsl/MSXslScriptManager.cs
mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
mcs/class/System.XML/System.Xml/XmlConvert.cs
mcs/class/System.XML/System.Xml/XmlInputStream.cs
mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs
mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
mcs/class/System.XML/Test/System.Xml.Xsl/XsltExceptionTests.cs
mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs
mcs/class/System.Xml.Linq/System.Xml.Linq/XAttribute.cs
mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
mcs/class/System/System.Collections.Generic/RBTree.cs
mcs/class/System/System.ComponentModel/Component.cs
mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs
mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
mcs/class/System/System.ComponentModel/TypeDescriptor.cs
mcs/class/System/System.ComponentModel/Win32Exception.cs
mcs/class/System/System.Configuration/AppSettingsReader.cs
mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
mcs/class/System/System.Configuration/ConfigurationSettings.cs
mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
mcs/class/System/System.Diagnostics/TraceListener.cs
mcs/class/System/System.IO.Ports/SerialPort.cs
mcs/class/System/System.IO.Ports/WinSerialStream.cs
mcs/class/System/System.Net.Mail/SmtpClient.cs
mcs/class/System/System.Net.Mail/SmtpException.cs
mcs/class/System/System.Net.Mail/SmtpFailedRecipientException.cs
mcs/class/System/System.Net.Mail/SmtpFailedRecipientsException.cs
mcs/class/System/System.Net.Sockets/NetworkStream.cs
mcs/class/System/System.Net.Sockets/Socket.cs
mcs/class/System/System.Net.Sockets/SocketException.cs
mcs/class/System/System.Net.Sockets/Socket_2_1.cs
mcs/class/System/System.Net.Sockets/TcpClient.cs
mcs/class/System/System.Net.Sockets/TcpListener.cs
mcs/class/System/System.Net.Sockets/UdpClient.cs
mcs/class/System/System.Net/CookieException.cs
mcs/class/System/System.Net/Dns.cs
mcs/class/System/System.Net/FileWebResponse.cs
mcs/class/System/System.Net/FtpWebRequest.cs
mcs/class/System/System.Net/HttpUtility.cs
mcs/class/System/System.Net/ProtocolViolationException.cs
mcs/class/System/System.Net/ServicePoint.cs
mcs/class/System/System.Net/ServicePointManager.cs
mcs/class/System/System.Net/WebConnection.cs
mcs/class/System/System.Net/WebException.cs
mcs/class/System/System.Net/WebHeaderCollection.cs
mcs/class/System/System.Net/WebResponse.cs
mcs/class/System/System.Text.RegularExpressions/Group.cs
mcs/class/System/System.Text.RegularExpressions/Match.cs
mcs/class/System/System.Text.RegularExpressions/Regex.cs
mcs/class/System/Test/System.Collections.Generic/QueueTest.cs
mcs/class/System/Test/System.Collections.Generic/StackTest.cs
mcs/class/System/Test/System.ComponentModel/ArrayConverterTests.cs
mcs/class/System/Test/System.ComponentModel/EnumConverterTests.cs
mcs/class/System/Test/System.ComponentModel/PropertyDescriptorCollectionTests.cs
mcs/class/System/Test/System.ComponentModel/ToolboxItemAttributeTests.cs
mcs/class/System/Test/System.ComponentModel/TypeConverterTests.cs
mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
mcs/class/System/Test/System.Configuration/SettingsBaseTest.cs
mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
mcs/class/System/Test/System.Net.Sockets/UdpClientTest.cs
mcs/class/System/Test/System.Net/DnsTest.cs
mcs/class/System/Test/System.Net/FileWebRequestTest.cs
mcs/class/System/Test/System.Net/FileWebResponseTest.cs
mcs/class/System/Test/System.Net/HttpListener2Test.cs
mcs/class/System/Test/System.Net/HttpListenerBasicIdentityTest.cs
mcs/class/System/Test/System.Net/HttpListenerPrefixCollectionTest.cs
mcs/class/System/Test/System.Net/HttpListenerRequestTest.cs
mcs/class/System/Test/System.Net/HttpListenerTest.cs
mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
mcs/class/System/Test/System.Net/HttpWebResponseTest.cs
mcs/class/System/Test/System.Net/IPAddressTest.cs
mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
mcs/class/System/Test/System.Net/ServicePointTest.cs
mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
mcs/class/System/Test/System.Net/WebProxyTest.cs
mcs/class/System/Test/System.Net/WebUtilityTest.cs
mcs/class/System/Test/System.Security.Cryptography/AsnEncodedDataTest.cs
mcs/class/System/Test/System.Security.Cryptography/OidCollectionTest.cs
mcs/class/System/Test/System.Security.Cryptography/OidEnumeratorTest.cs
mcs/class/System/Test/System.Security.Cryptography/OidTest.cs
mcs/class/System/Test/System/UriTest.cs
mcs/class/corlib/System/NumberFormatter.cs
mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs
mcs/class/corlib/Test/System.Collections.Generic/ListTest.cs
mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs
mcs/class/corlib/Test/System.Collections/HashtableTest.cs
mcs/class/corlib/Test/System.Collections/SortedListTest.cs
mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
mcs/class/corlib/Test/System.Globalization/DateTimeFormatInfoTest.cs
mcs/class/corlib/Test/System.Globalization/DaylightTimeTest.cs
mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
mcs/class/corlib/Test/System.IO/DirectoryTest.cs
mcs/class/corlib/Test/System.IO/FileInfoTest.cs
mcs/class/corlib/Test/System.IO/FileNotFoundExceptionTest.cs
mcs/class/corlib/Test/System.IO/FileStreamTest.cs
mcs/class/corlib/Test/System.IO/FileSystemInfoTest.cs
mcs/class/corlib/Test/System.IO/FileTest.cs
mcs/class/corlib/Test/System.IO/PathTest.cs
mcs/class/corlib/Test/System.IO/UnmanagedMemoryStreamTest.cs
mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
mcs/class/corlib/Test/System.Reflection/FieldInfoTest.cs
mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
mcs/class/corlib/Test/System.Reflection/TypeDelegatorTest.cs
mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
mcs/class/corlib/Test/System.Runtime.Remoting.Contexts/SynchronizationAttributeTest.cs
mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionTest.cs
mcs/class/corlib/Test/System.Security.Policy/ApplicationMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security.Policy/DomainApplicationMembershipConditionTest.cs
mcs/class/corlib/Test/System.Security/PermissionSetCollectionTest.cs
mcs/class/corlib/Test/System.Security/SecureStringCas.cs
mcs/class/corlib/Test/System.Security/SecureStringTest.cs
mcs/class/corlib/Test/System.Threading/InterlockedTest.cs
mcs/class/corlib/Test/System.Threading/MutexTest.cs
mcs/class/corlib/Test/System.Threading/ThreadTest.cs
mcs/class/corlib/Test/System/ActivatorTest.cs
mcs/class/corlib/Test/System/AppDomainSetupTest.cs
mcs/class/corlib/Test/System/ArrayTest.cs
mcs/class/corlib/Test/System/BadImageFormatExceptionTest.cs
mcs/class/corlib/Test/System/ConvertTest.cs
mcs/class/corlib/Test/System/DecimalTest.cs
mcs/class/corlib/Test/System/DecimalTest2.cs
mcs/class/corlib/Test/System/DelegateTest.cs
mcs/class/corlib/Test/System/EnumTest.cs
mcs/class/corlib/Test/System/EnvironmentTest.cs
mcs/class/corlib/Test/System/MathTest.cs
mcs/class/corlib/Test/System/StringComparerTest.cs
mcs/class/corlib/Test/System/StringTest.cs
mcs/class/corlib/Test/System/TimeZoneTest.cs
mcs/class/corlib/Test/System/TypeTest.cs
mcs/tools/mono-service/AssemblyInfo.cs
mcs/tools/mono-xmltool/xmltool.cs

index 82a24e7fa8387df2e745552ba6198d71f48e1019..2b7c5494fedc7896af7c5cdb1a97158188dfa9c7 100644 (file)
@@ -55,10 +55,8 @@ using System.Runtime.InteropServices;
 [assembly: Guid ("1ea4dbf0-3c3b-11cf-810c-00aa00389b71")]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
-#endif
 
 [assembly: ImportedFromTypeLib ("Accessibility")]
 
index 701ce4b9a7150f7c9f3990ea64a71c664b36fa39..87a5a89b00ec2a69f2fbea6671a18596173d1cb7 100644 (file)
@@ -33,11 +33,6 @@ using System;
 namespace Novell.Directory.Ldap.Utilclass
 {
        
-#if TARGET_JVM
-    // This dummy class workarounds a MS CSC bug by using SupportClass before
-       // using its inner class (SupportClass.AbstractSetSupport)
-       class RespExtensionSetDummy : SupportClass {}
-#endif
 
        /// <summary> This  class  extends the AbstractSet and Implements the Set
        /// so that it can be used to maintain a list of currently
index b5563d56cd200f3ab69fbacb36972c45693f9053..cba8084028dd5f008553d48ab2faa9f657fac88b 100644 (file)
@@ -48,9 +48,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright(" (C) 2003 Novell, Inc")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]                
-#if !TARGET_JVM 
 [assembly: CLSCompliant(true)]
-#endif
 
 //
 // Version information for an assembly consists of the following four values:
@@ -65,8 +63,6 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion (Consts.FxVersion)]
 
-#if (!TARGET_JVM)
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../mono.pub")]
-#endif
 
index 1dc68151233ae9c0697b92225cf0edc86deca44b..f2ef8e99597a3ee72f692def736a9bfa6906f4c2 100644 (file)
@@ -34,10 +34,8 @@ using System.Threading;
 using Novell.Directory.Ldap.Asn1;
 using Novell.Directory.Ldap.Rfc2251;
 using Novell.Directory.Ldap.Utilclass;
-#if !TARGET_JVM
 using Mono.Security.Protocol.Tls;
 using Mono.Security.X509.Extensions;
-#endif
 using Syscert = System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography;
 using System.Net;
@@ -45,9 +43,7 @@ using System.Net.Sockets;
 using System.Collections;
 using System.IO;
 using System.Text;
-#if !TARGET_JVM
 using Mono.Security.X509;
-#endif
 using System.Text.RegularExpressions;
 using System.Globalization;
 using System.Reflection;
@@ -735,7 +731,6 @@ namespace Novell.Directory.Ldap
                                {
                                        if ((in_Renamed == null) || (out_Renamed == null))
                                        {
-#if !TARGET_JVM
                                                if(Ssl)
                                                {
                                                        this.host = host;
@@ -796,13 +791,10 @@ namespace Novell.Directory.Ldap
                                                        out_Renamed = (System.IO.Stream) sslstream;*/
                                                }
                                                else{
-#endif
                                                        socket = new System.Net.Sockets.TcpClient(host, port);                          
                                                        in_Renamed = (System.IO.Stream) socket.GetStream();
                                                        out_Renamed = (System.IO.Stream) socket.GetStream();
-#if !TARGET_JVM
                                                }
-#endif
                                        }
                                        else
                                        {
@@ -1140,11 +1132,9 @@ namespace Novell.Directory.Ldap
                        
                        if (socket != null || sock != null)
                        {
-#if !TARGET_JVM
                                // Just before closing the sockets, abort the reader thread
                                if ((reader != null) && (reason != "reader: thread stopping")) 
                                reader.Abort();
-#endif
                                // Close the socket
                                try
                                {
@@ -1264,7 +1254,6 @@ namespace Novell.Directory.Ldap
                /* package */
                internal void  startTLS()
                {
-#if !TARGET_JVM                        
                        try
                        {
                                waitForReader(null);
@@ -1333,7 +1322,6 @@ namespace Novell.Directory.Ldap
                                throw new LdapException("The host is unknown", LdapException.CONNECT_ERROR, null, uhe);
                        }
                        return ;
-#endif
                }
                
                /*
@@ -1544,15 +1532,6 @@ namespace Novell.Directory.Ldap
                                        // before closing sockets, from shutdown
                                        return;
                                }
-#if TARGET_JVM
-                               catch (ObjectDisposedException)
-                               {
-                                       // we do not support Thread.Abort under java
-                                       // so we close the stream and the working thread
-                                       // catches ObjectDisposedException exception
-                                       return;
-                               }
-#endif
                                catch (System.IO.IOException ioe)
                                {
                                        
index f6c72497f9ebb2e89ab4dfc6ca0449f273721981..35ee09ca1511efe2fa2328e3243d485753151325 100644 (file)
@@ -34,18 +34,7 @@ using Novell.Directory.Ldap;
 using Novell.Directory.Ldap.Asn1;
 using Novell.Directory.Ldap.Rfc2251;
 using Novell.Directory.Ldap.Utilclass;
-#if !TARGET_JVM
 using Mono.Security.Protocol.Tls;
-#else
-using org.ietf.jgss;
-using javax.security.auth;
-using javax.security.auth.login;
-using java.security;
-
-using Novell.Directory.Ldap.Security;
-using System.Collections.Specialized;
-using System.Configuration;
-#endif
 using System.Security.Cryptography.X509Certificates;
 
 namespace Novell.Directory.Ldap
@@ -1199,13 +1188,6 @@ namespace Novell.Directory.Ldap
                
                public virtual void  Bind(System.String dn, System.String passwd, AuthenticationTypes authenticationTypes)
                {
-#if TARGET_JVM
-                       if (authenticationTypes != AuthenticationTypes.None &&
-                               authenticationTypes != AuthenticationTypes.ServerBind &&
-                               authenticationTypes != AuthenticationTypes.Anonymous)
-                               BindSecure(dn, passwd, authenticationTypes);
-                       else
-#endif
                                Bind(Ldap_V3, dn, passwd, defSearchCons);               
 
                        return ;
@@ -1542,11 +1524,6 @@ namespace Novell.Directory.Ldap
                        }
 
                        LdapMessage msg;
-#if TARGET_JVM
-                       if (mech != null)
-                               msg = new LdapBindRequest(version, "", mech, passwd, cons.getControls());
-                       else
-#endif
                                msg = new LdapBindRequest(version, dn, passwd, cons.getControls());
                        
                        msgId = msg.MessageID;
@@ -1565,127 +1542,12 @@ namespace Novell.Directory.Ldap
                                }
                        }
                        
-#if TARGET_JVM
-                       // stopping reader to enable stream replace after secure binding is complete, see Connection.ReplaceStreams()
-                       if (mech != null)
-                       {
-                               if (conn.BindSemIdClear) {
-                                       // need to acquire a semaphore only if bindSemId is clear
-                                       // because if we receive SASL_BIND_IN_PROGRESS the semaphore is not
-                                       // released when the response is queued
-                                       conn.acquireWriteSemaphore(msgId);
-                                       conn.BindSemId = msgId;
-                               }
-                               conn.stopReaderOnReply(msgId);
-                       }
-                       else
-#endif
                        // The semaphore is released when the bind response is queued.
                        conn.acquireWriteSemaphore(msgId);
                        
                        return SendRequestToServer(msg, cons.TimeLimit, queue, bindProps);
                }
 
-#if TARGET_JVM
-               private void BindSecure(System.String username, System.String password, AuthenticationTypes authenticationTypes)
-               {
-                       if ((authenticationTypes & AuthenticationTypes.Secure) != 0) {                  
-                               LoginContext loginContext = null;
-                               try {                                   
-                                       if (username != null && password != null) {
-                                               AuthenticationCallbackHandler callbackHandler = new AuthenticationCallbackHandler (username,password);
-                                               loginContext = new LoginContext (SecurityAppName, callbackHandler);
-                                       }
-                                       else
-                                               loginContext = new LoginContext (SecurityAppName);
-
-                                       loginContext.login ();
-                               }
-                               catch (Exception e) {
-                                       throw new LdapException ("Failed to create login security context", 80, "", e);
-                               }
-
-                               Krb5Helper krb5Helper = null;
-                               try {
-                                       krb5Helper = new Krb5Helper ("ldap@" + conn.Host, username, loginContext.getSubject (), authenticationTypes, SecurityMech);
-                               }
-                               finally {
-                                       loginContext.logout();
-                               }
-                               sbyte [] token = krb5Helper.ExchangeTokens (Krb5Helper.EmptyToken);
-
-                               for (;;) {
-                                       LdapResponseQueue queue = Bind(LdapConnection.Ldap_V3, username, token, null, null, AuthenticationMech);
-                                       LdapResponse res = (LdapResponse) queue.getResponse ();
-                                       if (res.ResultCode != LdapException.SASL_BIND_IN_PROGRESS &&
-                                               res.ResultCode != LdapException.SUCCESS) {
-                                               krb5Helper.Dispose();
-                                               throw new LdapException(ExceptionMessages.CONNECTION_ERROR, res.ResultCode, res.ErrorMessage);
-                                       }
-                                       Asn1OctetString serverSaslCreds = ((RfcBindResponse)res.Asn1Object.Response).ServerSaslCreds;
-                                       token = serverSaslCreds != null ? serverSaslCreds.byteValue () : null;
-
-                                       token = krb5Helper.ExchangeTokens(token == null ? Krb5Helper.EmptyToken : token);
-
-                                       if (res.ResultCode != LdapException.SASL_BIND_IN_PROGRESS)
-                                               break;
-
-                                       conn.ReplaceStreams (conn.InputStream,conn.OutputStream);
-                               }
-
-                               System.IO.Stream inStream = conn.InputStream;
-                               System.IO.Stream newIn = new SecureStream (inStream, krb5Helper);
-                               System.IO.Stream outStream = conn.OutputStream;
-                               System.IO.Stream newOut = new SecureStream (outStream, krb5Helper);
-                               conn.ReplaceStreams (newIn,newOut);
-                       }               
-               }
-
-               static string SecurityMech
-               {
-                       get {
-                               string securityMech = null;
-                                       NameValueCollection config = (NameValueCollection) ConfigurationSettings.GetConfig ("mainsoft.directoryservices/settings");
-                                       if (config != null) 
-                                               securityMech = config ["securitymech"];
-
-                                       if (securityMech == null) 
-                                               throw new ArgumentException("Security mechanism id not found in application settings");
-
-                               return securityMech;
-                       }
-               }
-
-               static string SecurityAppName
-               {
-                       get {
-                               string securityAppName = null; 
-                                       NameValueCollection config = (NameValueCollection) ConfigurationSettings.GetConfig ("mainsoft.directoryservices/settings");
-                                       if (config != null) 
-                                               securityAppName = config ["securityappname"];
-
-                                       if (securityAppName == null) 
-                                               throw new ArgumentException("Application section name not found in application settings");
-
-                               return securityAppName;
-                       }
-               }
-
-               static string AuthenticationMech
-               {
-                       get {
-                               string authenticationMech = null;
-                               NameValueCollection config = (NameValueCollection) ConfigurationSettings.GetConfig ("mainsoft.directoryservices/settings");
-                               if (config != null) 
-                                       authenticationMech = config ["authenticationmech"];
-
-                               if (authenticationMech == null) 
-                                       throw new ArgumentException("Authentication mechanism not found in application settings");
-
-                               return authenticationMech;
-                       }
-               }
-#endif
                
                //*************************************************************************
                // compare methods
index 0f9033a3dbea8ee25463db0cb5d643b61f8fc855..450ad0816486a8c47f5487928ad29aa2974f9883 100644 (file)
@@ -87,14 +87,10 @@ using System;
                [CLSCompliantAttribute(false)]
                public static sbyte[] ToSByteArray(byte[] byteArray)
                {
-#if TARGET_JVM
-                       return vmw.common.TypeUtils.ToSByteArray(byteArray);
-#else
                        sbyte[] sbyteArray = new sbyte[byteArray.Length];
                        for(int index=0; index < byteArray.Length; index++)
                                sbyteArray[index] = (sbyte) byteArray[index];
                        return sbyteArray;
-#endif
                }
                /*******************************/
                /// <summary>
@@ -105,14 +101,10 @@ using System;
                [CLSCompliantAttribute(false)]
                public static byte[] ToByteArray(sbyte[] sbyteArray)
                {
-#if TARGET_JVM
-                       return (byte[])vmw.common.TypeUtils.ToByteArray(sbyteArray);;
-#else
                        byte[] byteArray = new byte[sbyteArray.Length];
                        for(int index=0; index < sbyteArray.Length; index++)
                                byteArray[index] = (byte) sbyteArray[index];
                        return byteArray;
-#endif
                }
 
                /// <summary>
index c1ac154b05ab603423c74e4d05b8f4282a41f22d..49025b78c0939a5fbddfeb9b0260b666777e22a1 100644 (file)
@@ -56,10 +56,8 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM //TARGET_JVM does not support signing
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
-#endif
 
 [assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
index a49a9679f7b4009c89ccee2613f55ad44642c88f..1123e9ad15642f65c7df07e1bbf333a5feb79a2a 100644 (file)
@@ -769,28 +769,7 @@ namespace System.Configuration
        
        internal class ElementMap
        {
-#if TARGET_JVM
-               const string elementMapsKey = "ElementMap_elementMaps";
-               static Hashtable elementMaps
-               {
-                       get
-                       {
-                               Hashtable tbl = (Hashtable) AppDomain.CurrentDomain.GetData (elementMapsKey);
-                               if (tbl == null) {
-                                       lock (typeof (ElementMap)) {
-                                               tbl = (Hashtable) AppDomain.CurrentDomain.GetData (elementMapsKey);
-                                               if (tbl == null) {
-                                                       tbl = Hashtable.Synchronized (new Hashtable ());
-                                                       AppDomain.CurrentDomain.SetData (elementMapsKey, tbl);
-                                               }
-                                       }
-                               }
-                               return tbl;
-                       }
-               }
-#else
                static readonly Hashtable elementMaps = Hashtable.Synchronized (new Hashtable ());
-#endif
 
                readonly ConfigurationPropertyCollection properties;
                readonly ConfigurationCollectionAttribute collectionAttribute;
index 28b1d6bf3d4c4477c039b8e92d5a86a5c8451a70..28d4fa428db9c1d659da469c364ea55c279d54df 100644 (file)
@@ -119,9 +119,6 @@ namespace System.Configuration {
                        return ConfigurationFactory.Create (typeof(ExeConfigurationHost), map, userLevel);
                }
 
-#if TARGET_JVM
-               [MonoLimitation ("Supported only when the userLevel parameter is set to ConfigurationUserLevel.None. Other values are not supported because Environment.GetFolderPath method is not implemented.")]
-#endif
                public static Configuration OpenExeConfiguration (ConfigurationUserLevel userLevel)
                {
                        return OpenExeConfigurationInternal (userLevel, Assembly.GetEntryAssembly () ?? Assembly.GetCallingAssembly (), null);
index 8a76dd6fff5a0ff29f7e323a158db89ce1b61e52..56462d91d5516aabe22af675e3322d7d52d3a03c 100644 (file)
@@ -32,9 +32,7 @@
 using System.Collections;
 using System.Xml;
 using System.IO;
-#if !TARGET_JVM
 using System.Security.Cryptography.Xml;
-#endif
 using System.Configuration.Internal;
 
 namespace System.Configuration
index 80f410891de15586043111546f0b43cad5588e8f..e4d59f1466c2c3ba5604f17d5af8443d41d7afe9 100644 (file)
@@ -161,34 +161,24 @@ namespace System.Configuration
                {
                        throw new NotImplementedException ();
                }
-#if !TARGET_JVM
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                extern private static string get_bundled_machine_config ();
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                extern private static string get_bundled_app_config ();
-#endif
                
                public virtual Stream OpenStreamForRead (string streamName)
                {
                        if (String.CompareOrdinal (streamName, System.Runtime.InteropServices.RuntimeEnvironment.SystemConfigurationFile) == 0) {
-#if TARGET_JVM
-                               return (Stream) vmw.common.IOUtils.getStreamForGHConfigs (streamName);
-#else
                                string bundle = get_bundled_machine_config ();
                                if (bundle != null)
                                        return new MemoryStream (System.Text.Encoding.UTF8.GetBytes (bundle));
-#endif
                        }
 
                        if (String.CompareOrdinal (streamName, AppDomain.CurrentDomain.SetupInformation.ConfigurationFile) == 0) {
-#if TARGET_JVM
-                               throw new NotImplementedException();
-#else
                                string bundle = get_bundled_app_config ();
                                if (bundle != null)
                                        return new MemoryStream (System.Text.Encoding.UTF8.GetBytes (bundle));
-#endif
                        }
 
                        if (!File.Exists (streamName))
index 1efa2b99eb2b0e32a88ad5d498d8d3be166e15f2..d2e1a240f6d5c59621fa35c79d182eac32151c33 100644 (file)
@@ -429,11 +429,9 @@ namespace MonoTests.System.Configuration {
                {
                        SysConfig cfg = ConfigurationManager.OpenMachineConfiguration ();
                        Assert.IsTrue (cfg.Sections.Count > 0, "#1");
-#if !TARGET_JVM
                        ConfigurationSection s = cfg.SectionGroups ["system.net"].Sections ["connectionManagement"];
                        Assert.IsNotNull (s, "#2");
                        Assert.IsTrue (s is ConnectionManagementSection, "#3");
-#endif
                }
 
                [Test]
index 3ba5d998874688bee6feae0d69a1811ceb3661a1..35af604b15a306b469ce0c7b874e2131a7a8e140 100644 (file)
@@ -71,7 +71,6 @@ namespace MonoTests.System.Configuration {
                        Assert.IsNull (p3, "A1");
                }
 
-#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Intersect_wrongtype ()
@@ -80,7 +79,6 @@ namespace MonoTests.System.Configuration {
 
                        IPermission p3 = p1.Intersect (new StrongNameIdentityPermission (PermissionState.Unrestricted));
                }
-#endif
 
                [Test]
                public void Union ()
@@ -107,7 +105,6 @@ namespace MonoTests.System.Configuration {
                        Assert.IsTrue (((ConfigurationPermission)p3).IsUnrestricted(), "A2");
                }
 
-#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Union_wrongtypee ()
@@ -116,7 +113,6 @@ namespace MonoTests.System.Configuration {
 
                        IPermission p3 = p1.Union (new StrongNameIdentityPermission (PermissionState.Unrestricted));
                }
-#endif
 
                [Test]
                public void Subset ()
@@ -133,7 +129,6 @@ namespace MonoTests.System.Configuration {
                        Assert.IsTrue (p2.IsSubsetOf (null), "A6");
                }
 
-#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Subset_wrongtype ()
@@ -142,12 +137,8 @@ namespace MonoTests.System.Configuration {
 
                        Assert.IsFalse (p1.IsSubsetOf (new StrongNameIdentityPermission (PermissionState.Unrestricted)));
                }
-#endif
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void ToXml ()
                {
                        ConfigurationPermission p = new ConfigurationPermission (PermissionState.Unrestricted);
index cdaddedbbac73fcfa092ac3f6cb658068bbaea14..585271a2fe841c7834510b30cddeba3f20ec4167 100644 (file)
@@ -85,13 +85,9 @@ namespace MonoTests.System.Configuration.Util {
 
                public static string ThisConfigFileName {
                        get {
-#if TARGET_JVM
-                               return "System.Configuration.Test20.jar.config";
-#else
                                var asm = Assembly.GetCallingAssembly ();
                                var exe = Path.GetFileName (asm.Location);
                                return exe + ".config";
-#endif
                        }
                }
        }
index 9685771de92337bbd0ac565daa48f556ef489aa2..b575b386907105bfd5e44fe3dd8852fd80084c1a 100644 (file)
@@ -2265,11 +2265,9 @@ namespace System.Linq.Expressions {
 
                internal static bool IsUnsigned (Type t)
                {
-#if !TARGET_JVM
                        if (t.IsPointer)
                                return IsUnsigned (t.GetElementType ());
 
-#endif
                        return t == typeof (ushort) ||
                                t == typeof (uint) ||
                                t == typeof (ulong) ||
index 24d9c429e77d2166c0df866988d348632028e44a..ebb23a691f3af6c8893a719f7babc80297711270 100644 (file)
@@ -96,7 +96,6 @@ namespace MonoTests.System.Collections.Generic {
                }
 
                [Test]
-               [Category("TargetJvmNotWorking")]
                public void TestCopyTo ()
                {
                        var data = new [] {1, 2, 3, 4, 5};
index d524e80f5c1e12998c9bb67ccc3e6eeb915fca16..37d7a00082cc9bf300a725f3527b00022a47b11a 100644 (file)
@@ -192,7 +192,6 @@ namespace MonoTests.System.Linq.Expressions {
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")]
                public void ExpressionDelegateTarget ()
                {
                        var p = Expression.Parameter (typeof (string), "str");
@@ -220,7 +219,6 @@ namespace MonoTests.System.Linq.Expressions {
 
 #if !NET_4_0
                [Test]
-               [Category ("TargetJvmNotSupported")]
                public void GlobalsInScope ()
                {
                        var foo = new Foo { gazonk = "gazonk" };
index 0f367dd986f2fdf8afd918bead91f340c3ef7d06..2d977b1dceb7f0dc826a913366142e1e3de72c2f 100644 (file)
@@ -54,12 +54,8 @@ using System.Runtime.InteropServices;
 
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
-#if TARGET_JVM
-[assembly: AssemblyDelaySign (false)]
-#else
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../ecma.pub")]
-#endif
 
 [assembly: ComVisible (false)]
 [assembly: AllowPartiallyTrustedCallers]
index 073eef9f15620e79c4a0d84bb6d7303d1a12af0d..d6723da82112a360bbe8921f6051f7834b2e0215 100644 (file)
@@ -2144,7 +2144,6 @@ namespace DbLinq.Schema.Dbml
                }
        }
 
-       #if !TARGET_JVM
        #if !MONO_STRICT
     public
     #endif
@@ -2218,6 +2217,5 @@ namespace DbLinq.Schema.Dbml
                }
        }
 
-       #endif
 }
 
index a99d8338b1b17e427eaf2dee93a3e8577111720c..ae6d540857f86f84a0d2c2dc5b4574054ac44491 100644 (file)
@@ -32,11 +32,9 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AllowPartiallyTrustedCallers]
index 3bbda5263b9e07e4c0fdc42fe824ff910bfff143..8d0aa1cd4ce7bffe8651886f170221e8e0dd41b4 100644 (file)
@@ -71,11 +71,9 @@ namespace System.Data.OracleClient
                        return new OracleConnectionStringBuilder ();
                }
 
-#if !TARGET_JVM
                public override CodeAccessPermission CreatePermission (PermissionState state) {
                        return new OraclePermission (state);
                }
-#endif
 
                public override DbDataAdapter CreateDataAdapter () {
                        return new OracleDataAdapter ();
index 1a054138f30632cc89da7fe87299282678d48f9f..3fd8b632a9f0416ac6fb84124c0afd96e1ffb30f 100644 (file)
@@ -278,34 +278,6 @@ namespace MonoTests.System.Data.Utils {
                                        // The .NET Framework provides support for Oracle LOBs in the OracleClient namespace, but not in the Oracle namespace.
                                        // Since Visual MainWin does not support the OracleClient namespace, a partial support for this important feature is provided in the Oracle namespace.
                                        // See ms-help://MS.VSCC.2003/VMW.GH.1033/ghdoc/vmwdoc_ADONET_data_access_limitations_51.htm
-#if TARGET_JVM
-
-                                       row.Add("BLOB", new byte[]      {0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                               }, 4000);
-                                       row.Add("CLOB", SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               , 4000);
-                                       row.Add("NCLOB", SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               , 4000);
-#endif
                                        break;
                                        #endregion
 
index 9e0068d21ef801c52317af2c3c684ec5415c666b..0f2d77472a29850baa167899bc8663d84d3e0688 100644 (file)
@@ -376,9 +376,7 @@ namespace MonoTests.System.Data.Utils.Data
                /// <returns>The number of deleted rows.</returns>
                public static int ExecuteDelete(string a_sTableName, string a_sUniqueId)
                {
-#if !TARGET_JVM
                        return 0;
-#endif
                        int l_iRecordsDeleted;
                        OracleCommand l_cmdDelete = new OracleCommand();
                        l_cmdDelete.Connection = new OracleConnection(ConnectedDataProvider.ConnectionString);
index b18ab465f037196b184d59028424cedd6284d841..e6585b85a7f9cdd93d4a98a8ec857afbdeea5ef3 100644 (file)
@@ -50,9 +50,7 @@ public class OracleCommand_CommandTimeout : GHTBase
        }
 
        [Test]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public void run()
        {
                OracleCommand cmd = new OracleCommand();
index 4f0fd3c672e60f4e795f7008ac545f19e3c3363f..78a0c1289438ba866e7ff88b072753539fd68f13 100644 (file)
@@ -68,9 +68,7 @@ public class OracleDataAdapter_FillSchema_DsSt : ADONetTesterClass
 
        //Test case for bug #4708
        [Test(Description="Test case for bug #4708")]
-#if !TARGET_JVM
        [Ignore ("JVM test")]
-#endif
        public void TestLongSqlExpression()
        {
                BeginCase("Long SQL string cause java.lang.StackOverflowError (Test case for bug #4708)");
index 658309ae90648e6b6d923686ab510bac42bb4e04..388124e8647515c8d2bf34eba1390d8e9f0ab521 100644 (file)
@@ -64,9 +64,6 @@ namespace MonoTests.System.Data.OracleClient
                                DoTestTypes3(con);
                        }
                        
-#if TARGET_JVM
-                       DoTestTypes4(con);
-#endif
                //      DoTestTypes5(con);   //Table direct --> multipe tables
                        DoTestTypes6(con);
                        
index 317faa488a656d2467c7b02544b1ebb1e97668e3..663d6b77eac43e4403d1142ed95efe4d7d4f3eac 100644 (file)
@@ -70,9 +70,7 @@ public class OracleDataAdapter_GetFillParameters : GHTBase
        //BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
 
        [Test]
-#if !TARGET_JVM
        [Ignore ("JVM test")]
-#endif
        public void run()
        {
                Exception exp = null;
index 7e94c04c229b60680f616bc16b19c335b7503bd9..95f739ab56f9cc5c4b2fffb0342fbb60d9e8a502 100644 (file)
@@ -36,9 +36,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.OracleClient
 {
        [TestFixture]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public class OracleDataAdapter_Update_Ds :  ADONetTesterClass
        {
                public static void Main()
index a2c32c7414bc366a0410128d077c54e66067121b..aacab9fb3ba369850c8486612deb439ad0bd97ec 100644 (file)
@@ -35,9 +35,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.OracleClient
 {
        [TestFixture]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public class OracleDataAdapter_Update_DsStr : ADONetTesterClass
        {
                public static void Main()
index 9f99ce9cfc39013124b51df886908a3864394428..762716a789c08b573c2b0e096cb62080dd14b851 100644 (file)
@@ -33,9 +33,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.OracleClient
 {
        [TestFixture]
-#if !TARGET_JVM
         [Category("NotWorking")]
-#endif
        public class OracleDataAdapter_Update_Dt : ADONetTesterClass
        {
                public static void Main()
index d747284760e2aef9fb044829bdbb4b1cb48fd63c..a574e655b135be7a3449fd97a1636233179e3379 100644 (file)
@@ -49,9 +49,7 @@ public class OracleDataReader_GetName_I : GHTBase
        }
 
        [Test]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public void run()
        {
                Exception exp = null;
index 2e237b45abdfbe297aaa98a0041b1a820e940763..b03cc4c51f0c178f8be501b1d6b84a30b6411f44 100644 (file)
@@ -79,9 +79,7 @@ namespace MonoTests.System.Data.OracleClient
                }
 
                [Test]
-#if !TARGET_JVM
                [Ignore ("JVM test")]
-#endif
                public void TestMultipleResultSetsWithSQLText()
                {
 
@@ -351,9 +349,7 @@ namespace MonoTests.System.Data.OracleClient
                }
 
                [Test]
-#if !TARGET_JVM
                [Ignore ("JVM test")]
-#endif
                public void TestMultipleResultSetsWithSP()
                {
 #if !JAVA
index e1c09c5f4742dd5256c0c117fa9e602e560bd3ed..957651c579e8f71c519ac3545afe7e82b9f8829e 100644 (file)
@@ -49,9 +49,7 @@ public class OracleDataReader_ctor : GHTBase
        }
 
        [Test]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public void run()
        {
                Exception exp = null;
index e375cb451272b8c3fa9e98a0a83934e61a7835fe..4b9593536f4b046d5a7c074429cd4ec14f131838 100644 (file)
@@ -94,9 +94,6 @@ public class OracleParameter_ctor_SOtype : ADONetTesterClass
        }
 
        [Test]
-//#if !TARGET_JVM
-//     [Category("NotWorking")]
-//#endif
        public void SimpleTypesWithDBNull()
        {
                OracleConnection con=null;
@@ -187,4 +184,4 @@ public class OracleParameter_ctor_SOtype : ADONetTesterClass
                }
        }
 }
-}
\ No newline at end of file
+}
index 3179050053c1ee8b4231f2e65e61d2f61c1ebba3..d0d5e93f00056a4086b60709fe1487e182c21aa7 100644 (file)
@@ -33,9 +33,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.OracleClient
 {
        [TestFixture]
-#if !TARGET_JVM
        [Category("NotWorking")]
-#endif
        public class OracleTransaction_Rollback : ADONetTesterClass
        {
                public static void Main()
index 9f8a04e98aa12ae22ac67002ccd19bc6cad77c70..a98cee8e7236c6a37520be4cfafe94df9e7197e7 100644 (file)
@@ -51,18 +51,14 @@ using System.Runtime.InteropServices;
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
-#endif
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: ComVisible (false)]
 [assembly: AllowPartiallyTrustedCallers]
 
 [assembly: AssemblyDelaySign (true)]
-#if !TARGET_JVM
        [assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
index c12cb34c49a70197e0e77128b77831bf2122f3e0..df795e2bb50fa16ee40e2390525b28d64d6145d2 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data.Common {
        public enum CatalogLocation 
index ae3262f24daa74e1629e4e38eb17918770a71cc8..75cfc1fb3927998d3e11110a9a5ae4ef4d3a6f54 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.ComponentModel;
 using System.Data;
index 9f55fba24f2c647b071a4cf5574234d3875ec338..d0e494463a6502e2598197ba8cbf9fcb10a2c237 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.ComponentModel;
 using System.Data;
index 94355018c4ca9741791ba6d0486402cb6e04055f..156497a6814660743833328682219851e2743fd6 100644 (file)
@@ -32,7 +32,7 @@
 
 using System.ComponentModel;
 using System.Data;
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 using System.Transactions;
 #endif
 
@@ -97,7 +97,7 @@ namespace System.Data.Common {
 
                protected abstract DbCommand CreateDbCommand ();
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
                public virtual void EnlistTransaction (Transaction transaction)
                {
                        throw new NotSupportedException ();                        
index 1eca5f966abd5e821456873a50edf8713296010f..5ff28000e32475b085d9e0e9dcb0c77e3f7e2d81 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data.Common {
        public abstract class DbDataSourceEnumerator
index f1ecefdde8cb0b51350896927fc494d6775c8fbb..d22af6a36f2b19c57178dd09c93384c58568bd96 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 using System.Collections;
 using System.ComponentModel;
 
index 82d6600f29b46c46a8d25a300911fd075ca2b1c1..fd56302648d254ca9f379358175017840d17e304 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Collections;
 using System.ComponentModel;
index 63c9a560ce21bd1050ba00714ff1203becc7c816..0ea515a3455225089acd4a687aef53509eb85b09 100644 (file)
@@ -49,11 +49,7 @@ namespace System.Data.Common {
                public static DbProviderFactory GetFactory (DataRow providerRow)
                {
                        string assemblyType = (string) providerRow ["AssemblyQualifiedName"];
-#if TARGET_JVM // case insensitive GetType is not supported
-                       Type type = Type.GetType (assemblyType, false);
-#else
                        Type type = Type.GetType (assemblyType, false, true);
-#endif
                        if (type != null && type.IsSubclassOf (typeof (DbProviderFactory))) {
                                // Provider factories are singletons with Instance field having
                                // the sole instance
index 8ce2a17db1eed9bc23db93b9a4268a2aaf32b493..592fdffa0e9f53c09e6cb4f110dc3822fabb3709 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Collections;
 using System.Security;
index 846ffed87bcc17d02d2f3777b857816702713825..a368bf3f224a432c772c1e61cd33fd75525a8a6e 100644 (file)
@@ -31,7 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data.Common {
        public enum DbProviderSupportedClasses 
index e07c0bf3747e08dde394e2a4263390e81b644b0c..ae4da776ac72935b77c9579470c12dd5dc04be1a 100644 (file)
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if TARGET_JVM
-
-using System.ComponentModel;
-
-namespace System.Data.Common {
-       public abstract class DbTable : DataTable
-       {
-               #region Constructors
-
-               [MonoTODO]
-               protected DbTable (DbProviderFactory providerFactory)
-               {
-               }
-
-               #endregion // Constructors
-
-               #region Properties
-
-               [MonoTODO]      
-               public ConflictOption ConflictOption {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbConnection Connection {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbCommand DeleteCommand {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbCommand InsertCommand {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbProviderFactory ProviderFactory {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public bool ReturnProviderSpecificTypes {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbCommand SelectCommand {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public override ISite Site {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DataTableMapping TableMapping {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public int UpdateBatchSize {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]      
-               public DbCommand UpdateCommand {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-
-               #endregion // Properties
-
-               #region Methods
-
-               [MonoTODO]
-               public DataRelation AddChildTable (string relationName, DbTable childTable, string parentColumnName, string childColumnName)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public DataRelation AddChildTable (string relationName, DbTable childTable, string[] parentColumnNames, string[] childColumnNames)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public override void BeginInit ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected virtual DbCommandBuilder CreateCommandBuilder (DbConnection connection)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected override void Dispose (bool disposing)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public override void EndInit ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Fill (object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Fill (FillOptions options, object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Fill (FillOptions options, DbTransaction transaction, object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int FillPage (int startRecord, int maxRecords, object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int FillPage (int startRecord, int maxRecords, FillOptions options, object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int FillPage (int startRecord, int maxRecords, FillOptions options, DbTransaction transaction, object[] parameterValues)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected virtual string GenerateQuery (DbCommandBuilder cmdBuilder)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               protected virtual string GenerateQueryForHierarchy (DbCommandBuilder builder, DataTable[] tableList)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Update ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Update (UpdateOptions updateOptions)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int Update (UpdateOptions updateOptions, DbTransaction transaction)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int UpdateRows (DataRow[] dataRows)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int UpdateRows (DataRow[] dataRows, UpdateOptions updateOptions)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public int UpdateRows (DataRow[] dataRows, UpdateOptions updateOptions, DbTransaction transaction)
-               {
-                       throw new NotImplementedException ();
-               }
-
-
-               #endregion // Methods
-       }
-}
-
-#endif
index ecd803de560ba9e6dbcc2ac8e05b92c7ce8641eb..319ca96328957de20b95e9be2092a64ec69efa87 100644 (file)
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data.Common
 {
index da645ca64fc0561f159bf1154ca0c5ba17a578d9..b270c61899caa014abf55c9bdc28fb47e3fbc6e4 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data.Common {
        public enum SchemaLocation 
index f738a187a8dc03c03f18067eaad96122f3e94a02..83d8294334ced3e4605dbfb81d534c9426de1a38 100644 (file)
@@ -37,7 +37,7 @@ using System.Data.Common;
 using System.EnterpriseServices;
 using System.Runtime.InteropServices;
 using System.Text;
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 using System.Transactions;
 #endif
 
index 4b34e1ae47a589f37560e55ac495519a339e4e44..14aac00fa4322fc8245f9ac385c33b4212f8c9f4 100644 (file)
@@ -32,7 +32,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Data.Common;
 
index a8e8d2079bf478c3b87d06da6eb907811ce1c8e5..ce413ac5c260b0c0ff31f2d0b521595aa7607432 100644 (file)
@@ -32,7 +32,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Collections;
 using System.Data.Common;
index 9d5bb5876665f99aa93a875b0b6bee269a15953a..1035df2bc46e53b9012af0eb1e95a4cd5476378d 100644 (file)
@@ -32,7 +32,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Data.Common;
 
index ff3af6873e78d2c857466a6736ae8256697bd48c..2eeef4d5c36147ea13a495cf35fced263ed09454 100644 (file)
@@ -32,7 +32,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 using System.Collections;
 using System.Data.Common;
index 82669cd5c76725d9bd6ecae74b3f90656c9eb96f..2b70404d4d06c8d95297ea6b5589390c1149c223 100644 (file)
@@ -31,9 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !TARGET_JVM
 using Mono.Data.Tds.Protocol;
-#endif
 using System;
 using System.Xml;
 using System.Text;
@@ -348,7 +346,6 @@ namespace System.Data.SqlTypes
                        return AdjustScale (n, -(n.Scale), false);
                }
 
-#if !TARGET_JVM
                internal static SqlDecimal FromTdsBigDecimal (TdsBigDecimal x)
                {
                        if (x == null)
@@ -356,7 +353,6 @@ namespace System.Data.SqlTypes
                        else
                                return new SqlDecimal (x.Precision, x.Scale, !x.IsNegative, x.Data);
                }
-#endif
 
                public override int GetHashCode ()
                {
index 471fde51e61d4d9fec8cc5c0dc6946fee2cd8910..749dbbc7b813dda556018123849858ef58c9159a 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data {
        public enum ConflictOption
index 54a422df3c6cd0a6d6645182588d7c1321c7889a..93cfbce35c8c1f5101c521e6750899164dec225b 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 
 namespace System.Data {
        public enum ConflictOptions 
index 7f661949235aea01ab43a2e7cea964242317a823..5cce950a4df2e4860f729338a475c7eaad56f576 100644 (file)
@@ -31,7 +31,7 @@
 //
 
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 namespace System.Data {
        public enum FillOptions 
        {
index 0596e965759dfc3980367272f4eb643f39be3020..3ae20904d96b56837b7a1e97502f3e90848f6344 100644 (file)
@@ -31,7 +31,7 @@
 //
 
 
-#if NET_2_0 || TARGET_JVM
+#if NET_2_0
 namespace System.Data {
        public enum UpdateOptions 
        {
index a91f79d2b9bb018e87ba460fed51d3526f054b00..b49f606ade11bf86b5bbd985543552a800519452 100644 (file)
@@ -280,34 +280,6 @@ namespace MonoTests.System.Data.Utils {
                                        // The .NET Framework provides support for Oracle LOBs in the OracleClient namespace, but not in the OleDb namespace.
                                        // Since Visual MainWin does not support the OracleClient namespace, a partial support for this important feature is provided in the OleDb namespace.
                                        // See ms-help://MS.VSCC.2003/VMW.GH.1033/ghdoc/vmwdoc_ADONET_data_access_limitations_51.htm
-#if TARGET_JVM
-
-                                       row.Add("BLOB", new byte[]      {0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                                       ,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-                                                                                               }, 4000);
-                                       row.Add("CLOB", SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               , 4000);
-                                       row.Add("NCLOB", SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               + SAMPLE_STRING
-                                               , 4000);
-#endif
                                        break;
                                        #endregion
 
index 2a9f7cdada47f9412343c5f13fffed815e86b799..a8ff6acfa256b4b617a7ddcdf174e9f0366f5e9a 100644 (file)
@@ -60,9 +60,7 @@ namespace MonoTests.System.Data.Common
                public void Default ()\r
                {\r
                        DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute (SecurityAction.Assert);\r
-#if !TARGET_JVM\r
                        Assert.AreEqual (a.ToString (), a.TypeId.ToString (), "TypeId");\r
-#endif                 \r
                        Assert.IsFalse (a.Unrestricted, "Unrestricted");\r
                        Assert.IsFalse (a.AllowBlankPassword, "AllowBlankPassword");\r
                        Assert.AreEqual (String.Empty, a.ConnectionString, "ConnectionString");\r
index d34d6d46076d02d05032c931d5f5181b38b7725e..f093bd97e2140a3b8ef7339fa0dac2414e0469a7 100644 (file)
@@ -376,9 +376,6 @@ namespace MonoTests.System.Data.Common
                }
                
                [Test]
-#if TARGET_JVM
-               [Ignore ("Does not work with TARGET_JVM")]
-#endif
                public void ToStringTest()
                {
                        Assert.AreEqual ("System.Data.Common.DataColumnMappingCollection", columnMapCollection.ToString(), "test1");
index a14c3f85ab300d8e0535447c5899281a7d0f7bdb..a481c27af3204141bc09a905cafcfda6f28099af 100644 (file)
@@ -360,9 +360,6 @@ namespace MonoTests.System.Data.Common
                }
                
                [Test]
-#if TARGET_JVM
-               [Ignore ("Does not work with TARGET_JVM")]
-#endif
                public void ToStringTest()
                {
                        Assert.AreEqual("System.Data.Common.DataTableMappingCollection", tableMapCollection.ToString(), "test1");
index 8f94229a47c3925a696a93f5866aedf2090ebe71..28a82f1ad1a84fc7a0e971d6fb15bd899c369140 100644 (file)
@@ -38,9 +38,6 @@ using System.Xml;
 using System.Data.SqlTypes;
 using System.Threading;
 using System.Globalization;
-#if TARGET_JVM
-using DivideByZeroException = System.ArithmeticException;
-#endif
 
 namespace MonoTests.System.Data.SqlTypes
 {
index 0df3b9d3aa23d307cd39fc72f873cb3b4bc61cd2..ee3817830d924524eddcc87857240ab9b024c245 100644 (file)
@@ -35,9 +35,6 @@ using NUnit.Framework;
 using System;
 using System.Xml;
 using System.Data.SqlTypes;
-#if TARGET_JVM
-using DivideByZeroException = System.ArithmeticException;
-#endif
 #if NET_2_0
 using System.Xml.Serialization;
 using System.IO;
index 0492fd708c8fb3f642dc7324a3be4952fb133efa..37b186347a071fb03d0f4e96ef024f8a42b42b2c 100644 (file)
@@ -34,9 +34,6 @@
 using System;
 using System.Xml;
 using System.Data.SqlTypes;
-#if TARGET_JVM
-using DivideByZeroException = System.ArithmeticException;
-#endif
 
 #if NET_2_0
 using System.Xml.Serialization;
index a1bf2f00f7dc7fc6184bef735a1f861082ab0b94..a8230d0310d0e01cffc3914a868994de539003ab 100644 (file)
@@ -191,9 +191,6 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
-#endif
                public void CompareTo()
                {
                        SqlByte Test = new SqlByte (1);
@@ -271,9 +268,6 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
-#endif
                public void Greaters()
                {
                        // GreateThan ()
@@ -288,9 +282,6 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
-#endif
                public void Lessers()
                {
                        // LessThan()
@@ -377,11 +368,7 @@ namespace MonoTests.System.Data.SqlTypes
                                byte test = Test1.GetUnicodeBytes () [105];
                                Assert.Fail ("#N05");
                        } catch (Exception e) {
-#if TARGET_JVM
-                               Assert.IsTrue (typeof (IndexOutOfRangeException).IsAssignableFrom(e.GetType()), "#N06");
-#else
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType(), "#N06");
-#endif
                        }
                }
 
@@ -545,9 +532,6 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
-#endif
                public void ThanOrEqualOperators()
                {
                        // == -operator
index 36d82147cdc8a24a22c9a5a8e300d6a9dacebcba..5eae92a3963e12b5c443040ea5557aa0b1cb6a1e 100644 (file)
@@ -132,9 +132,6 @@ public class BinarySerializationTest
                dt.Rows[1].RejectChanges();
        }
        [Test]
-#if TARGET_JVM
-       [Ignore ("Net Binary formatting is not supported for DataSet")]
-#endif
        public void DataTableSerializationTest2 ()
        {
                //Serialize Table
@@ -274,9 +271,6 @@ public class BinarySerializationTest
                        
        }
        [Test]
-#if TARGET_JVM
-       [Ignore ("Net Binary formatting is not supported for DataSet")]
-#endif
        public void Test_With_Null_Values2 ()
        {
                //Serialize Table
@@ -454,9 +448,6 @@ public class BinarySerializationTest
                
        }
        [Test]
-#if TARGET_JVM
-       [Ignore ("Net Binary formatting is not supported for DataSet")]
-#endif
        public void DataSetSerializationTest2 ()
        {
                DataSet ds = new DataSet ();
@@ -653,9 +644,6 @@ public class BinarySerializationTest
                        Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]);
        }
        [Test]
-#if TARGET_JVM
-       [Ignore ("Net Binary formatting is not supported for DataSet")]
-#endif
        public void Constraint_Relations_Test2 ()
        {
                //Serialize DataSet
index 8b0b4a376d2d8eb0fc80d886230ff7452d0516cf..b9eaac532205903e295ac9e7450bda7fb00e8490 100644 (file)
@@ -638,9 +638,6 @@ namespace MonoTests.System.Data
                }       
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Does not work with TARGET_JVM")]
-#endif
                public void ToStringTest ()
                {
                        DataTable Table = new DataTable ("test_table");
index f7e298569fc5844310f57576a13e24f67d047fc7..cc42664fcabebe24e4d11ff3d985f7ceddb15df5 100644 (file)
@@ -112,9 +112,7 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (1, Rows.Count, "test#01");
                        Assert.IsFalse (Rows.IsReadOnly, "test#02");
                        Assert.IsFalse (Rows.IsSynchronized, "test#03");
-#if !TARGET_JVM
                        Assert.AreEqual ("System.Data.DataRowCollection", Rows.ToString (), "test#04");
-#endif
                        
                        string [] cols = new string [2];
                        cols [0] = "first";
@@ -126,9 +124,7 @@ namespace MonoTests.System.Data
                        Rows.Add (cols);
                        
                        Assert.AreEqual (3, Rows.Count, "test#05");
-#if !TARGET_JVM
                        Assert.AreEqual ("System.Data.DataRow",  Rows [0].ToString (), "test#06");
-#endif
                        Assert.AreEqual (DBNull.Value, Rows [0] [0], "test#07");
                        Assert.AreEqual (DBNull.Value, Rows [0] [1], "test#08");
                        Assert.AreEqual ("first", Rows [1] [0], "test#09");
index e96ca5f7c55640e23d1f2c97c981026daf81b074..05d0eddc7fba37c4b61b41c75063272fec799956 100644 (file)
@@ -348,9 +348,6 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Does not work with TARGET_JVM")]
-#endif
                public void ToStringTest()
                {
                        DataTableCollection tbcol = _dataset[0].Tables;
index a98713e2b888e539bf4e250528908e78a6c02e04..13f46ad9858c1df6fa56b6c5e758365c0d4f3e76 100644 (file)
@@ -295,9 +295,6 @@ namespace MonoTests.System.Data
         }
         
         [Test]
-#if TARGET_JVM
-       [Ignore ("Should review the test")]
-#endif
         public void TestReadXml()
         {
             // For reading, DataTable.ReadXml only supports reading in xml with
index d752df4f1ac2c291267ff18e0a7ff3f7c12aaaee..86dd5e737e6ed2882418e50afc78df88bf0ae4b9 100644 (file)
@@ -2911,9 +2911,6 @@ namespace MonoTests.System.Data
                #region Read/Write XML Tests
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ReadXmlSchema ()
                {
                        DataTable Table = new DataTable ();
@@ -3806,9 +3803,6 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void WriteXmlSchema_Hierarchy ()
                {
                        DataSet ds = new DataSet ();
@@ -3841,9 +3835,6 @@ namespace MonoTests.System.Data
                [Test]
                [Ignore ("MS behavior is far from consistent to be regarded as a reference implementation.")]
                // See the same-named tests in DataSetTest.cs
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                // WriteXmlSchema doesn't have overload wityh 2 parameters in System.Data
                // and is commented-out TWICE below
                public void ReadWriteXmlSchema()
@@ -3957,9 +3948,6 @@ namespace MonoTests.System.Data
                [Test]
                [Ignore ("MS behavior is far from consistent to be regarded as a reference implementation.")]
                // See the same-named tests in DataSetTest.cs
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ReadWriteXmlSchema_IgnoreSchema ()
                {
                        DataSet ds = new DataSet ();
@@ -4153,7 +4141,7 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (5, n, "n");
                }
 
-#if !TARGET_JVM && !MONOTOUCH
+#if !MONOTOUCH
                [Test]
                public void NFIFromBug55978 ()
                {
index 045df6951bd4fa703c607b3d4a586e324c1f9193..ac68e08fbb36a0d93b543449309330d08282b5c8 100644 (file)
@@ -511,9 +511,6 @@ namespace MonoTests.System.Data
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")] // defect 5446
-#endif
                public void Find_3 ()
                {
                        dataView.Sort = "itemID, itemName";
index aba9cdd34a8584977b370791392b3b76e582b09e..a633fe836e4ea6997183f9087e3a8c771baacb39 100644 (file)
@@ -31,11 +31,9 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AllowPartiallyTrustedCallers]
index 1c486ea8ab0df054d54d72b666de620db7848032..eda06fb8885b7d660b4bfb68f2f3484edaba231f 100644 (file)
@@ -31,11 +31,9 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AllowPartiallyTrustedCallers]
index 8cddd927e9f88eb1d9d115b3226c6ed3b7441878..115adf5d92e99816cc711ffd306f3a2579a1f4ad 100644 (file)
@@ -54,11 +54,9 @@ using System.Runtime.InteropServices;
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../msfinal.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
index 978b9573839c5b32587de235ecdc224a823650a3..1f53a32fa99388862ac5b872162faa57666403eb 100644 (file)
@@ -86,7 +86,6 @@ namespace System.Drawing.Design
                {
                        return false;
                }
-#if !TARGET_JVM
                public void PaintValue (object value, Graphics canvas, Rectangle rectangle)
                {
                        PaintValue (new PaintValueEventArgs (null, value, canvas, rectangle));
@@ -99,7 +98,6 @@ namespace System.Drawing.Design
                        // but on the other hand the class is not abstract. Could never observe it did paint anything
                        return;
                }
-#endif
 #if NET_2_0
                public virtual bool IsDropDownResizable {
                        get { return false; }
index a3cb2e9af5a2f4787064a92ca00e3fcf5721d388..7629ddc4eee040590ed0f0a5e97a79e21f8dc4c8 100644 (file)
@@ -38,9 +38,6 @@ namespace System.Drawing.Drawing2D
        /// <summary>
        /// Summary description for Blend.
        /// </summary>
-#if TARGET_JVM
-       [MonoTODO]
-#endif
        public sealed class Blend
        {
                private float [] positions;
index 53d86e6e551527fac0f1f7f8d3ba9171b4203b44..d1095dc1ddf3b8bf11350994a89cb0c0db3a9c8e 100644 (file)
@@ -34,9 +34,6 @@ namespace System.Drawing.Imaging
 {
        // MUST BE KEPT IN SYNC WITH gdip.h in libgdiplus!
        // The first 6 fields MUST also match MS definition
-#if TARGET_JVM
-       [MonoTODO]
-#endif
        [StructLayout(LayoutKind.Sequential)]
        public sealed class BitmapData {
                private int             width;
index 602434eedbb8f397fe7940dba901153069f2e583..88584b271d3d299713954dc34f3a14e552bb6c0c 100644 (file)
@@ -37,9 +37,6 @@ using System.IO;
 using System.Reflection;
 
 namespace System.Drawing.Imaging {
-#if TARGET_JVM
-       [MonoTODO]
-#endif
        public sealed class ColorMap {
 
                private Color newColor;
index 6e73ea4e6d0bded81c1fdf93dc37c406671a7c4a..3b042cad175e945dbd3b31229f1e5d37beb6b404 100644 (file)
@@ -36,9 +36,6 @@ using System.Runtime.InteropServices;
 
 namespace System.Drawing.Imaging
 {
-#if TARGET_JVM
-       [MonoTODO]
-#endif
        [StructLayout (LayoutKind.Sequential)]
        public sealed class ColorMatrix
        {
index 078af159161be2670864798770736abfc52a29aa..28599a7b47ac2b4be9aeafb6465542b4c20cc5f8 100644 (file)
@@ -69,7 +69,6 @@ namespace System.Drawing.Imaging
                                return flags;
                        }
                }
-#if !TARGET_JVM
                /* Caller should call FreeHGlobal*/
                internal IntPtr getGDIPalette() 
                {
@@ -112,6 +111,5 @@ namespace System.Drawing.Imaging
                                offset += 4;
                        }
                }
-#endif
        }
 }
index dfac530436d2f39e472d407947bb58249004a633..2a5b25c585cd725480a3d8e415c13a4b3043d7bf 100644 (file)
@@ -58,7 +58,6 @@ namespace System.Drawing.Imaging
                        // Nothing
                        GC.SuppressFinalize(this);
                }
-#if !TARGET_JVM
                internal IntPtr ToNativePtr () {
                        IntPtr result;
                        IntPtr ptr;
@@ -106,6 +105,5 @@ namespace System.Drawing.Imaging
 
                        return result;
                }
-#endif
        }
 }
index 242d2c3342c0be5510063074f5ad80c6e22fc9b3..bd73b2d2bc1535d5da26029d121dfb7626e7b704 100644 (file)
@@ -88,9 +88,7 @@ namespace System.Drawing.Imaging {
        }
 
        [MonoTODO ("Metafiles, both WMF and EMF formats, aren't supported.")]
-#if !TARGET_JVM
        [StructLayout(LayoutKind.Sequential)]
-#endif
        public sealed class MetafileHeader {
 
                private MonoMetafileHeader header;
index 3f5235d3af7a589e4c3879e2be78589ac3bf0f5d..6c62a9f080fbc4dcd2da5e1996c6fec553867b19 100644 (file)
@@ -42,9 +42,7 @@ namespace System.Drawing
 #if ONLY_1_1
        [ComVisible (true)]
 #endif
-#if !TARGET_JVM
        [Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
-#endif
        [Serializable]
        public struct Color {
 
@@ -71,29 +69,6 @@ namespace System.Drawing
                // however it's bad to keep a string (reference) in a struct
                internal string name;
 // #endif
-#if TARGET_JVM
-               internal java.awt.Color NativeObject {
-                       get {
-                               return new java.awt.Color (R, G, B, A);
-                       }
-               }
-
-               internal static Color FromArgbNamed (int alpha, int red, int green, int blue, string name, KnownColor knownColor)
-               {
-                       Color color = FromArgb (alpha, red, green, blue);
-                       color.state = (short) (ColorType.Known|ColorType.Named);
-                       color.name = KnownColors.GetName (knownColor);
-                       color.knownColor = (short) knownColor;
-                       return color;
-               }
-
-               internal static Color FromArgbSystem (int alpha, int red, int green, int blue, string name, KnownColor knownColor)
-               {
-                       Color color = FromArgbNamed (alpha, red, green, blue, name, knownColor);
-                       color.state |= (short) ColorType.System;
-                       return color;
-               }
-#endif
 
                public string Name {
                        get {
index 7cd02aeae199a75c7159196cbe6fb9c4594c8e60..2a49f6f945bcefdf116a46760938597450620a05 100644 (file)
@@ -225,15 +225,10 @@ namespace System.Drawing
                        lock (creatingCached) {
                                if (cached != null)
                                        return cached;
-#if TARGET_JVM
-                               Color [] colors = new Color [KnownColors.Values.Length - 1];
-                               Array.Copy (KnownColors.Values, 1, colors, 0, colors.Length);
-#else
                                Array colors = Array.CreateInstance (typeof (Color), KnownColors.ArgbValues.Length - 1);
                                for (int i=1; i < KnownColors.ArgbValues.Length; i++) {
                                        colors.SetValue (KnownColors.FromKnownColor ((KnownColor)i), i - 1);
                                }
-#endif
 
                                Array.Sort (colors, 0, colors.Length, new CompareColors ());
                                cached = new StandardValuesCollection (colors);
index 22baf05498bca403c427ac40e30c178ab610afdf..7998c487ecae4419932c5145d8a8ac6306591d47 100644 (file)
@@ -46,12 +46,10 @@ namespace System.Drawing
                public FontConverter ()
                {
                }
-#if !TARGET_JVM
                ~FontConverter ()
                {
                        // required to match API definition
                }       
-#endif
                public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
                {
                        if (sourceType == typeof (string))
index 1ba6fd32a0b12bb702a23dae6913fcf7eb6592bb..c8b3f6c7282d51da8ae314bcbc7a2230b7002888 100644 (file)
@@ -54,13 +54,6 @@ namespace System.Drawing
                
                public static readonly Rectangle Empty;
 
-#if TARGET_JVM
-               internal java.awt.Rectangle NativeObject {
-                       get {
-                               return new java.awt.Rectangle(X,Y,Width,Height);
-                       }
-               }
-#endif
 
                /// <summary>
                ///     Ceiling Shared Method
index 0c651fe097749b4dedf847894835e31d1109686a..dc2ea17506ee790732f14e1e3baedf71a8df13d8 100644 (file)
@@ -47,13 +47,6 @@ namespace System.Drawing
                
                public static readonly RectangleF Empty;
 
-#if TARGET_JVM
-               internal java.awt.geom.Rectangle2D NativeObject {
-                       get {
-                               return new java.awt.geom.Rectangle2D.Float(X,Y,Width,Height);
-                       }
-               }
-#endif
 
                /// <summary>
                ///     FromLTRB Shared Method
@@ -255,14 +248,6 @@ namespace System.Drawing
                }
 
 
-#if TARGET_JVM
-               internal RectangleF (java.awt.geom.RectangularShape r2d) {
-                       this.x = (float) r2d.getX ();
-                       this.y = (float) r2d.getY ();
-                       this.width = (float) r2d.getWidth ();
-                       this.height = (float) r2d.getHeight ();
-               }
-#endif
 
                /// <summary>
                ///     Bottom Property
index 8f9baacf2be8d679ab06113b276d2c3e775c4340..a8612cc29b9effb40d891d5869204c9a9469d1c7 100644 (file)
@@ -13,16 +13,8 @@ using System.Drawing.Imaging;
 \r
 #if MONOTOUCH\r
 #else\r
-#if TARGET_JVM\r
-using awt = java.awt;\r
-using javax.imageio;\r
-using java.lang;\r
-using java.security;\r
-using java.awt.image;\r
-#else\r
 using System.Windows.Forms;\r
 #endif\r
-#endif\r
 \r
 using NUnit.Framework;\r
 \r
@@ -115,13 +107,8 @@ namespace DrawingTestHelper
                Hashtable _hash;\r
                CachedResults _results;\r
 \r
-#if TARGET_JVM\r
-               public const string FileName = "CachedResults.xml";\r
-               public const string NewFileName = "NewCachedResults.xml";\r
-#else\r
                public const string FileName = "dotnet.CachedResults.xml";\r
                public const string NewFileName = "dotnet.NewCachedResults.xml";\r
-#endif\r
                public readonly static XmlSerializer TestSuiteSerializer =\r
                        new XmlSerializer(typeof(CachedResults));\r
 \r
@@ -437,11 +424,7 @@ namespace DrawingTestHelper
                }\r
                public static DrawingTest Create (int width, int height, string ownerClass) {\r
                        DrawingTest test;\r
-#if TARGET_JVM\r
-                       test = new JavaDrawingTest ();\r
-#else\r
                        test = new NetDrawingTest ();\r
-#endif\r
                        test.Init (width, height);\r
                        test.OwnerClass = ownerClass;\r
                        return test;\r
@@ -460,144 +443,6 @@ namespace DrawingTestHelper
                #endregion\r
        }\r
 \r
-#if TARGET_JVM\r
-       internal class JavaDrawingTest:DrawingTest {\r
-               java.awt.image.BufferedImage _image;\r
-               java.awt.image.BufferedImage Image {\r
-                       get {\r
-                               if (_image != null)\r
-                                       return _image;\r
-                               Type imageType = typeof (Bitmap);\r
-                               PropertyInfo [] props = imageType.GetProperties (\r
-                                       BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly);\r
-\r
-                               PropertyInfo prop = null;\r
-                               foreach (PropertyInfo p in props) {\r
-                                       if (p.Name == "NativeObject")\r
-                                               if (p.PropertyType == typeof(java.awt.image.BufferedImage))\r
-                                                       prop = p;\r
-                               }\r
-\r
-                               MethodInfo method = prop.GetGetMethod (true);\r
-                               _image = (java.awt.image.BufferedImage) method.Invoke (_bitmap, new object [0]);\r
-                               return _image;\r
-                       }\r
-               }\r
-\r
-               public JavaDrawingTest () {}\r
-\r
-               protected override double GetExpectedNorm (double myNorm) {\r
-                       return ExpectedResults.GetNorm(TestName);\r
-               }\r
-\r
-               protected override Bitmap GetReferenceImage(string testName) {\r
-                       try{\r
-                               string dotNetResultsFolder = @"";\r
-                               string fileName = dotNetResultsFolder + testName.Replace(":", "_") + ".png";\r
-                               return new Bitmap(fileName);\r
-                       }\r
-                       catch(System.Exception e) {\r
-                               throw new System.Exception("Error creating .Net reference image");\r
-                       }\r
-               }\r
-\r
-               private class JavaForm:java.awt.Dialog,IMyForm {\r
-                       class EventListener : java.awt.@event.WindowListener {\r
-                               #region WindowListener Members\r
-\r
-                               public void windowOpened(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowOpened implementation\r
-                               }\r
-\r
-                               public void windowActivated(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowActivated implementation\r
-                               }\r
-\r
-                               public void windowClosed(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowClosed implementation\r
-                               }\r
-\r
-                               public void windowDeiconified(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowDeiconified implementation\r
-                               }\r
-\r
-                               public void windowIconified(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowIconified implementation\r
-                               }\r
-\r
-                               public void windowClosing(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowClosing implementation\r
-                                       java.awt.Window w = arg_0.getWindow();\r
-                                       java.awt.Window par = w.getOwner ();\r
-                                       w.dispose();\r
-                                       par.dispose ();\r
-                               }\r
-\r
-                               public void windowDeactivated(java.awt.@event.WindowEvent arg_0) {\r
-                                       // TODO:  Add ttt.windowDeactivated implementation\r
-                               }\r
-\r
-                               #endregion\r
-                       }\r
-\r
-                       java.awt.Image _image;\r
-                       Size _s;\r
-\r
-                       public JavaForm (string title, java.awt.Image anImage, Size s)\r
-                               : base(new java.awt.Frame(), title, true) {\r
-                               _image = anImage;\r
-                               _s = s;\r
-                               \r
-                               addWindowListener(new EventListener());\r
-                       }\r
-                       public override void paint (java.awt.Graphics g) {\r
-                               base.paint (g);\r
-                               awt.Insets insets = this.getInsets ();\r
-                               g.drawImage (_image, insets.left, insets.top, null);\r
-                       }\r
-                       void IMyForm.Show () {\r
-                               awt.Insets insets = this.getInsets ();\r
-                               base.setSize (_s.Width + insets.left + insets.right,\r
-                                       _s.Width + insets.top + insets.bottom);\r
-                               this.show ();\r
-                               //save the image\r
-                               //ImageIO.write((java.awt.image.RenderedImage)_image, "png", new java.io.File("test.java.png"));\r
-                       }\r
-               }\r
-\r
-               protected override IMyForm CreateForm(string title) {\r
-                       return new JavaForm (title, Image, _bitmap.Size);\r
-               }\r
-               \r
-               protected override string DetermineCallingFunction() {\r
-                       System.Exception e = new System.Exception ();\r
-                       java.lang.Class c = vmw.common.TypeUtils.ToClass (e);\r
-                       java.lang.reflect.Method m = c.getMethod ("getStackTrace",\r
-                               new java.lang.Class [0]);\r
-                       java.lang.StackTraceElement [] els = (java.lang.StackTraceElement [])\r
-                               m.invoke (e, new object [0]);\r
-                       java.lang.StackTraceElement el = els [4];\r
-                       return el.getClassName () + "." + _ownerClass + "." + el.getMethodName ();\r
-               }\r
-\r
-               public override string CalculateSHA1() {\r
-                       MessageDigest md = MessageDigest.getInstance ("SHA");\r
-                       DataBufferInt dbi = (DataBufferInt) Image.getRaster ().getDataBuffer ();\r
-                       for (int i=0; i<dbi.getNumBanks (); i++) {\r
-                               int [] curBank = dbi.getData (i);\r
-                               for (int j=0; j<curBank.Length; j++) {\r
-                                       int x = curBank[j];\r
-                                       md.update ((sbyte) (x & 0xFF));\r
-                                       md.update ((sbyte) ((x>>8) & 0xFF));\r
-                                       md.update ((sbyte) ((x>>16) & 0xFF));\r
-                                       md.update ((sbyte) ((x>>24) & 0xFF));\r
-                               }\r
-                       }\r
-                       byte [] resdata = (byte[])vmw.common.TypeUtils.ToByteArray(md.digest());\r
-                       return Convert.ToBase64String (resdata);\r
-               }\r
-       }\r
-#else\r
        internal class NetDrawingTest:DrawingTest {\r
                public NetDrawingTest () {}\r
 \r
@@ -680,6 +525,5 @@ namespace DrawingTestHelper
                }\r
 \r
        }\r
-#endif\r
 \r
 }\r
index d1796375f2ced175dfce572d05d6ff4598230097..9848565605712e7fde336a7da9279d79c3dca56e 100644 (file)
@@ -438,9 +438,6 @@ namespace Test.Sys.Drawing.GraphicsFixtures {
                        Assert.That(t.Compare(), Is.True);\r
                }\r
                [Test]\r
-#if TARGET_JVM\r
-               [Category("NotWorking")] // defect 6145\r
-#endif\r
                public void DrawImageWithResolution() {\r
                        t.Graphics.DrawImage(bmp2, 0, 0);\r
                        t.Show();\r
@@ -454,9 +451,6 @@ namespace Test.Sys.Drawing.GraphicsFixtures {
                        Assert.That(t.Compare(), Is.True);\r
                }\r
                [Test]\r
-#if TARGET_JVM\r
-               [Category ("NotWorking")] // defect 6145\r
-#endif\r
                public void DrawImageInContainer2() {\r
                        t.Graphics.BeginContainer(new Rectangle(10, 10, 50, 50), new Rectangle(70, 70, 100, 100), GraphicsUnit.Pixel);\r
                        t.Graphics.DrawImage(bmp2, 0, 0);\r
index 1fca5558d21e864e8815a404190021d3ed5b06e6..96e81b672f572a7af5ad58d936a93eea93df2ceb 100644 (file)
@@ -78,7 +78,6 @@ namespace MonoCasTests.System.Drawing.Design {
                        unit.DefaultValues ();
                }
 
-#if !TARGET_JVM
                [Test]
                [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
                public void UnitTests_PaintValue ()
@@ -87,7 +86,6 @@ namespace MonoCasTests.System.Drawing.Design {
                        unit.PaintValue_PaintValueEventArgs ();
                        unit.PaintValue ();
                }
-#endif
 
                // we use reflection to call UITypeEditor class as it's protected by a 
                // LinkDemand (which will be converted into full demand, i.e. a stack 
index b1027f46ffc4857df34d7e9004f94f21383cea29..c48dd5b3f8852863fbd64f34fad50857a828d432 100644 (file)
@@ -65,7 +65,6 @@ namespace MonoTests.System.Drawing.Design {
 #endif
                }
 
-#if !TARGET_JVM
                [Test]
                public void PaintValue_PaintValueEventArgs_Null ()
                {
@@ -83,6 +82,5 @@ namespace MonoTests.System.Drawing.Design {
                {
                        editor.PaintValue (null, graphics, Rectangle.Empty);
                }
-#endif
        }
 }
index 3c8626244cac5e7241a2dc755ab1ad39d16338ff..ffe43baaf86bdf10cd476cccb24a0b04745e53b2 100644 (file)
@@ -97,9 +97,6 @@ namespace MonoTests.System.Drawing.Drawing2D
 
                [Test]
                [ExpectedException (typeof (OverflowException))]
-#if TARGET_JVM
-               [Category ("NotWorking")] // defect 6364
-#endif
                public void ColorBlend_Negative ()
                {
                        ColorBlend cb = new ColorBlend (-1);
index 444e1e6066e765db76f854651ffc19418122af1d..5bbb621669657116d8d701bd0f952f06ac2e2fad 100644 (file)
@@ -97,9 +97,6 @@ namespace MonoTests.System.Drawing.Drawing2D
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestDrawing ()
                {
                        // create a bitmap with big enough dimensions 
index f792ecced8675097a877e894df9004124b649e9f..47c8947577b27ee27507d81b683f693b21765574 100644 (file)
@@ -75,9 +75,6 @@ namespace MonoTests.System.Drawing.Imaging {
 
                /* Checks bitmap features on a know 1bbp bitmap */
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Bitmap1bitFeatures ()
                {
                        string sInFile = getInFile ("bitmaps/almogaver1bit.bmp");
@@ -154,9 +151,6 @@ namespace MonoTests.System.Drawing.Imaging {
 
                /* Checks bitmap features on a know 8bbp bitmap */
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Bitmap8bitFeatures ()
                {
                        string sInFile = getInFile ("bitmaps/almogaver8bits.bmp");
@@ -232,9 +226,6 @@ namespace MonoTests.System.Drawing.Imaging {
 
 
                /* Checks bitmap features on a know 24-bits bitmap */
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [Test]
                public void Bitmap24bitFeatures()
                {
@@ -308,7 +299,6 @@ namespace MonoTests.System.Drawing.Imaging {
                        }
                }
 
-#if !TARGET_JVM
                [Test]
                public void Bitmap24bitData ()
                {
@@ -434,7 +424,6 @@ namespace MonoTests.System.Drawing.Imaging {
                                }
                        }
                }
-#endif
 
                /* Checks bitmap features on a know 32-bits bitmap (codec)*/
                [Test]
@@ -548,36 +537,24 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_24bppRgb ()
                {
                        Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppRgb ()
                {
                        Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppRgb, true);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppArgb ()
                {
                        Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppRgb, true);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppPArgb ()
                {
                        Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppRgb, true);
index 228594e726944dab82876206011adabe530251cd..ecce1ac458bc1ea1ef0248445371d54137a6ca55 100644 (file)
@@ -160,10 +160,8 @@ namespace MonoTests.System.Drawing.Imaging {
                        Assert.AreEqual (0, cm.Matrix41, "4,1");\r
                        Assert.AreEqual (0, cm.Matrix42, "4,2");\r
                        Assert.AreEqual (0, cm.Matrix43, "4,3");\r
-#if !TARGET_JVM\r
                        Assert.AreEqual (100, Marshal.SizeOf (cm), "object");\r
                        Assert.AreEqual (100, Marshal.SizeOf (typeof (ColorMatrix)), "type");\r
-#endif\r
                }\r
 \r
                [Test]\r
index dcca275389db39b44af0396ed25b6aeb85583c75..b4724040e1e4b1908ca15fe12af82095708422a4 100644 (file)
@@ -71,9 +71,6 @@ namespace MonoTests.System.Drawing.Imaging {
 
                // Text Color Matrix processing
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ColorMatrix1 ()
                {                       
                        Color clr_src, clr_rslt;
@@ -93,9 +90,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ColorMatrix2 ()
                {
                        Color clr_src, clr_rslt;
@@ -152,18 +146,12 @@ namespace MonoTests.System.Drawing.Imaging {
                }
        
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ColorMatrix_80323_UsingAlpha ()
                {
                        Bug80323 (Color.FromArgb (100, 255, 0, 0));
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ColorMatrix_80323_WithoutAlpha ()
                {
                        // this color is identical, once drawn over the bitmap, to Color.FromArgb (100, 255, 0, 0)
@@ -186,9 +174,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_Null ()
                {
@@ -211,9 +196,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_Default_Any ()
                {
@@ -223,9 +205,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_Default_Count ()
                {
@@ -235,9 +214,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays ()
                {
@@ -247,9 +223,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Any ()
                {
@@ -259,9 +232,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Bitmap ()
                {
@@ -271,9 +241,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Brush ()
                {
@@ -283,9 +250,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Count ()
                {
@@ -295,9 +259,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Default ()
                {
@@ -307,9 +268,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Pen ()
                {
@@ -319,9 +277,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_AltGrays_Text ()
                {
@@ -344,9 +299,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_SkipGrays_Any ()
                {
@@ -356,9 +308,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_SkipGrays_Count ()
                {
@@ -368,9 +317,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_InvalidFlag ()
                {
@@ -380,9 +326,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrix_InvalidType()
                {
@@ -392,9 +335,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrices_Null_ColorMatrix ()
                {
@@ -414,9 +354,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrices_ColorMatrix_Null_AltGrays ()
                {
@@ -437,9 +374,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                public void SetColorMatrices_Gray ()
                {
                        Color c = ProcessColorMatrices (Color.Gray, global_color_matrix, global_gray_matrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
@@ -453,9 +387,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                public void SetColorMatrices_Color ()
                {
                        Color c = ProcessColorMatrices (Color.MidnightBlue, global_color_matrix, global_gray_matrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
@@ -469,9 +400,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrices_InvalidFlags ()
                {
@@ -481,9 +409,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                [ExpectedException (typeof (ArgumentException))]
                public void SetColorMatrices_InvalidType ()
                {
@@ -524,9 +449,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("ImageAttributes is not supported in GH")]
-#endif
                public void ColorMatrixAlpha ()
                {
                        for (int i = 0; i < 256; i++) {
index c5159e65c4d050f045bdc2b60bb50555578f80c5..45397a4b7020b2c91a748b6d4db9a32b2ceda738 100644 (file)
@@ -122,9 +122,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Decoders ()
                {
                        Assert.AreEqual (8, decoders.Count, "Count");
@@ -148,9 +145,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Encoders ()
                {
                        Assert.AreEqual (5, encoders.Count, "Count");
@@ -171,9 +165,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void BMPCodec()
                {
                        Guid g = new Guid ("557cf400-1a04-11d3-9a73-0000f81ef32e");
@@ -184,9 +175,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void GifCodec()
                {
                        Guid g = new Guid ("557cf402-1a04-11d3-9a73-0000f81ef32e");
@@ -197,9 +185,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
                
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void JpegCodec()
                {
                        Guid g = new Guid ("557cf401-1a04-11d3-9a73-0000f81ef32e");
@@ -210,9 +195,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void PngCodec()
                {
                        Guid g = new Guid ("557cf406-1a04-11d3-9a73-0000f81ef32e");
@@ -223,9 +205,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TiffCodec ()
                {
                        Guid g = new Guid ("557cf405-1a04-11d3-9a73-0000f81ef32e");
@@ -236,9 +215,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IconCodec_Encoder ()
                {
                        Guid g = new Guid ("557cf407-1a04-11d3-9a73-0000f81ef32e");
@@ -246,9 +222,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IconCodec_Decoder ()
                {
                        Guid g = new Guid ("557cf407-1a04-11d3-9a73-0000f81ef32e");
@@ -259,9 +232,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void EmfCodec_Encoder ()
                {
                        Guid g = new Guid ("557cf403-1a04-11d3-9a73-0000f81ef32e");
@@ -269,9 +239,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void EmfCodec_Decoder ()
                {
                        Guid g = new Guid ("557cf403-1a04-11d3-9a73-0000f81ef32e");
@@ -283,9 +250,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void WmfCodec_Encoder ()
                {
                        Guid g = new Guid ("557cf404-1a04-11d3-9a73-0000f81ef32e");
@@ -293,9 +257,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void WmfCodec_Decoder ()
                {
                        Guid g = new Guid ("557cf404-1a04-11d3-9a73-0000f81ef32e");
index 5044a1ad3e387f97f8bcd142d0bee905d08e652b..9644d8eedf59e48d83adaf4df17af8f39ed7b7d8 100644 (file)
@@ -72,9 +72,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("#8853")]
-#endif
                public void Bitmap8bbpIndexedGreyscaleFeatures ()
                {
                        string sInFile = getInFile ("bitmaps/nature-greyscale.jpg");
@@ -116,9 +113,6 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Bitmap8bbpIndexedGreyscalePixels ()
                {
                        string sInFile = getInFile ("bitmaps/nature-greyscale.jpg");
@@ -150,7 +144,6 @@ namespace MonoTests.System.Drawing.Imaging {
                        }
                }
 
-#if !TARGET_JVM
                [Test]
                public void Bitmap8bbpIndexedGreyscaleData ()
                {
@@ -212,13 +205,9 @@ namespace MonoTests.System.Drawing.Imaging {
                                }
                        }
                }
-#endif
 
                /* Checks bitmap features on a known 24-bits bitmap */
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Bitmap24bitFeatures ()
                {
                        string sInFile = getInFile ("bitmaps/nature24bits.jpg");
@@ -283,7 +272,6 @@ namespace MonoTests.System.Drawing.Imaging {
                        }
                }
 
-#if !TARGET_JVM
                [Test]
                public void Bitmap24bitData ()
                {
@@ -408,7 +396,6 @@ namespace MonoTests.System.Drawing.Imaging {
                                }
                        }
                }
-#endif
 
                private void Save (PixelFormat original, PixelFormat expected)
                {                               
@@ -449,36 +436,24 @@ namespace MonoTests.System.Drawing.Imaging {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_24bppRgb ()
                {
                        Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppRgb ()
                {
                        Save (PixelFormat.Format32bppRgb, PixelFormat.Format24bppRgb);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppArgb ()
                {
                        Save (PixelFormat.Format32bppArgb, PixelFormat.Format24bppRgb);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Save_32bppPArgb ()
                {
                        Save (PixelFormat.Format32bppPArgb, PixelFormat.Format24bppRgb);
index 308f3ab47d9b57718c43353543b1005baf5bd112..ff6d12c0ada4c22a2103394975990b9a395e3f8e 100644 (file)
@@ -59,9 +59,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void CanConvertFrom () {
                        Assert.IsTrue (colconv.CanConvertFrom (typeof (String)), "CCF#1");
                        Assert.IsTrue (colconv.CanConvertFrom (null, typeof (String)), "CCF#1a");
@@ -92,9 +89,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFrom ()
                {
                        Color color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -196,9 +190,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFrom_x4 ()
                {
                        colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -367,9 +358,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_InvalidNumber ()
                {
                        try {
@@ -399,9 +387,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_InvalidNumber ()
                {
                        try {
index eb1de4a8dba5287576d63246e1a7216ae04da587..ffd4e836938236fe4b3a20304814781d109dc945 100644 (file)
@@ -83,9 +83,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void FromHtml_PoundNegative ()
                {
                        ColorTranslator.FromHtml ("#-1");
@@ -100,9 +97,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void FromHtml_Unknown ()
                {
                        ColorTranslator.FromHtml ("unknown-color-test");
index 435377815f437845d1a1d5bfc809d30894902e0f..d21141233081d1921366b112afdc074a646751dc 100644 (file)
@@ -47,9 +47,6 @@ namespace MonoTests.System.Drawing {
 
        [TestFixture]
        [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
-#if TARGET_JVM
-       [Category ("NotWorking")]
-#endif
        public class TestBitmap {
                
                [Test]
@@ -239,26 +236,17 @@ namespace MonoTests.System.Drawing {
 #if NET_2_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_BitmapData_Null ()
                {
-#if !TARGET_JVM
                        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);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_32_32_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -269,16 +257,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_32_24_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -289,16 +272,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_24_24_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format24bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -309,16 +287,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_24_32_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format24bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -329,7 +302,6 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 #endif
 
@@ -634,9 +606,6 @@ namespace MonoTests.System.Drawing {
                
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void FileDoesNotExists ()
                {                       
                        Bitmap  bmp = new Bitmap ("FileDoesNotExists.jpg");                     
@@ -675,7 +644,6 @@ namespace MonoTests.System.Drawing {
                        hash = new MD5CryptoServiceProvider().ComputeHash (pixels);
                        return ByteArrayToString (hash);
                }
-#if !TARGET_JVM
                public string RotateIndexedBmp (Bitmap src, RotateFlipType type)
                {
                        int pixels_per_byte;
@@ -726,7 +694,6 @@ namespace MonoTests.System.Drawing {
                        byte[] hash = new MD5CryptoServiceProvider().ComputeHash (pixel_data);
                        return ByteArrayToString (hash);
                }
-#endif         
                
                
                /*
@@ -749,7 +716,6 @@ namespace MonoTests.System.Drawing {
 
                }
 
-#if !TARGET_JVM
                /*
                        Rotate 1- and 4-bit bitmaps in different ways and check the
                        resulting pixels using MD5
@@ -1095,7 +1061,6 @@ namespace MonoTests.System.Drawing {
                                }
                        }
                }
-#endif         
                [Test]
                public void DefaultFormat1 ()
                {
@@ -1712,11 +1677,7 @@ namespace MonoTests.System.Drawing {
        }
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("Unsafe code is not supported")]
-#endif
        public class BitmapFullTrustTest {
-#if !TARGET_JVM
                [Test]
                public void BitmapIntIntIntPixelFormatIntPtrCtor ()
                {
@@ -1877,7 +1838,6 @@ namespace MonoTests.System.Drawing {
                                Assert.IsTrue (image2.RawFormat.Equals (ImageFormat.MemoryBmp), "2.RawFormat");
                        }
                }
-#endif
        }
 }
 
index fd4ddc9d21f0342e4b3b1d19164be5e81b809b6c..6b922e2a719b5d228e05d0807c669ca62c7d3e93 100644 (file)
@@ -49,9 +49,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Throws ArgumentException - Implementation specific")]
-#endif
                public void Dispose ()
                {
                        Brushes.YellowGreen.Dispose ();
index 25ae527e75f34df997e643715fb5c104079f709b..a5d2eb58db969cde6725c4271e5baf49a723a49e 100644 (file)
@@ -1181,9 +1181,6 @@ namespace MonoTests.System.Drawing {
                        0x01, 0x00, 0x0B };
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Deserialize ()
                {
                        BinaryFormatter bf = new BinaryFormatter ();
@@ -1201,9 +1198,6 @@ namespace MonoTests.System.Drawing {
                        67,111,108,111,114,5,115,116,97,116,101,1,0,0,0,9,7,7,2,0,0,0,10,0,0,0,0,0,0,0,0,37,0,1,0,11 };
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Deserialize2 ()
                {
                        BinaryFormatter bf = new BinaryFormatter ();
@@ -1229,9 +1223,6 @@ namespace MonoTests.System.Drawing {
                        67,111,108,111,114,5,115,116,97,116,101,1,0,0,0,9,7,7,2,0,0,0,10,255,0,0,255,0,0,0,0,0,0,2,0,11};
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Deserialize3 ()
                {
                        BinaryFormatter bf = new BinaryFormatter ();
@@ -1285,7 +1276,6 @@ namespace MonoTests.System.Drawing {
                        }
                }
 
-#if !TARGET_JVM
                private void Compare (KnownColor kc, GetSysColorIndex index)
                {
                        // we get BGR than needs to be converted into ARGB
@@ -1335,7 +1325,6 @@ namespace MonoTests.System.Drawing {
                        Compare (KnownColor.MenuHighlight, GetSysColorIndex.COLOR_MENUHIGHLIGHT);
 #endif
                }
-#endif // TARGET_JVM
        }
 }
 
index 05038a11360b1e150422caa6247be4ce56efaed9..f01160f3b76bc84c2b9bd47bc92e8c0e0b89883e 100644 (file)
@@ -118,7 +118,6 @@ namespace MonoTests.System.Drawing{
                        public string lfFaceName;
                }
 
-#if !TARGET_JVM
                [Test]
                [Category ("CAS")]
                [ExpectedException (typeof (SecurityException))]
@@ -199,13 +198,9 @@ namespace MonoTests.System.Drawing{
                        Font f = new Font ("Arial", 10);
                        f.ToLogFont (null);
                }
-#endif
                [Test]
 #if ONLY_1_1
                [ExpectedException (typeof (ArgumentNullException))]
-#endif
-#if TARGET_JVM
-               [Category ("NotWorking")]
 #endif
                public void Font_StringNull_Float ()
                {
@@ -219,9 +214,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float ()
                {
                        Font f = new Font (name, 12.5f);
@@ -240,9 +232,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float_FontStyle ()
                {
                        Font f = new Font (name, 12.5f, FontStyle.Bold);
@@ -261,9 +250,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float_FontStyle_GraphicsUnit ()
                {
                        Font f = new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Pixel);
@@ -282,18 +268,12 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float_FontStyle_GraphicsUnit_Display ()
                {
                        new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Display);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float_FontStyle_GraphicsUnit_Byte ()
                {
                        Font f = new Font (name, 12.5f, FontStyle.Strikeout, GraphicsUnit.Inch, Byte.MaxValue);
@@ -312,9 +292,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_String_Float_FontStyle_GraphicsUnit_Byte_Bool ()
                {
                        Font f = new Font (name, 12.5f, FontStyle.Underline, GraphicsUnit.Document, Byte.MinValue, true);
@@ -349,9 +326,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float ()
                {
                        Font f = new Font (FontFamily.GenericMonospace, 12.5f);
@@ -370,9 +344,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float_FontStyle ()
                {
                        Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Bold);
@@ -391,9 +362,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float_FontStyle_GraphicsUnit ()
                {
                        Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Millimeter);
@@ -413,18 +381,12 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Display ()
                {
                        new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Display);
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Byte ()
                {
                        Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Strikeout, GraphicsUnit.Inch, Byte.MaxValue);
@@ -443,9 +405,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Byte_Bool ()
                {
                        Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Underline, GraphicsUnit.Document, Byte.MinValue, true);
@@ -484,9 +443,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Dispose_Height ()
                {
                        Font f = new Font (name, 12.5f);
@@ -496,26 +452,17 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Dispose_ToLogFont ()
                {
-#if !TARGET_JVM
                        Font f = new Font (name, 12.5f);
                        f.Dispose ();
                        LOGFONT lf = new LOGFONT();
                        f.ToLogFont (lf);
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Dispose_ToLogFont_LoopCharSet ()
                {
-#if !TARGET_JVM
                        Font f = new Font (name, 12.5f);
                        f.Dispose ();
                        LOGFONT lf = new LOGFONT ();
@@ -560,21 +507,15 @@ namespace MonoTests.System.Drawing{
                                        Assert.Fail ("Unexcepted exception {0} at iteration {1}", e, i);
                                }
                        }
-#endif
                }
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Dispose_ToHFont ()
                {
-#if !TARGET_JVM
                        Font f = new Font (name, 12.5f);
                        f.Dispose ();
                        f.ToHfont ();
-#endif
                }
                
                [Test]
index 36568741c3ffaf922423b1279f01a5e57d230522..203dfe3479469582760b4703bf4bb1e137ab59cd 100644 (file)
@@ -94,18 +94,12 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Check parameters")]
-#endif
                public void Constructor_IconNull_Int_Int ()
                {
                        new Icon ((Icon)null, 32, 32);
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Constructor_Icon_IntNegative_Int Not Working")]
-#endif
                public void Constructor_Icon_IntNegative_Int ()
                {
                        Icon neg = new Icon (icon, -32, 32);
@@ -115,18 +109,12 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Check parameters")]
-#endif
                public void Constructor_IconNull_Size ()
                {
                        new Icon ((Icon) null, new Size (32, 32));
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Constructor_Icon_Size_Negative Not Working")]
-#endif
                public void Constructor_Icon_Size_Negative ()
                {
                        Icon neg = new Icon (icon, new Size (-32, -32));
@@ -135,9 +123,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Constructor_Icon_Int_Int_NonSquare Not Working")]
-#endif
                public void Constructor_Icon_Int_Int_NonSquare ()
                {
                        Icon non_square = new Icon (icon, 32, 16);
@@ -217,9 +202,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Check parameters")]
-#endif
                public void Constructor_Type_StringNull ()
                {
                        new Icon (typeof (Icon), null);
@@ -227,38 +209,23 @@ namespace MonoTests.System.Drawing {
 #if NET_2_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Constructor_StreamNull_Size Not Implemented")]
-#endif
                public void Constructor_StreamNull_Size ()
                {
-#if !TARGET_JVM
                        new Icon ((Stream) null, new Size (32, 32));
-#endif
                }
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-#if TARGET_JVM
-               [Ignore ("Constructor_StringNull_Size Not Implemented")]
-#endif
                public void Constructor_StringNull_Size ()
                {
-#if !TARGET_JVM
                        new Icon ((string) null, new Size (32, 32));
-#endif
                }
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-#if TARGET_JVM
-               [Ignore ("Constructor_StringNull_Int_Int Not Implemented")]
-#endif
                public void Constructor_StringNull_Int_Int ()
                {
-#if !TARGET_JVM
                        new Icon ((string) null, 32, 32);
-#endif
                }
 #endif
 
@@ -281,7 +248,6 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (32, clone.Size.Height, "Size.Height");
                }
 
-#if !TARGET_JVM
                [Test]
                public void CloneHandleIcon ()
                {
@@ -291,7 +257,6 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (SystemIcons.Hand.Size.Width, clone.Size.Width, "Size.Width");
                        Assert.AreEqual (SystemIcons.Hand.Size.Height, clone.Size.Height, "Size.Height");
                }
-#endif
 
                private void XPIcon (int size)
                {
@@ -331,9 +296,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("SelectFromUnusualSize_Small16 Not Working")]
-#endif
                public void SelectFromUnusualSize_Small16 ()
                {
                        using (FileStream fs = File.OpenRead (TestBitmap.getInFile ("bitmaps/80509.ico"))) {
@@ -421,18 +383,12 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (NullReferenceException))]
-#if TARGET_JVM
-               [Ignore ("Throws NullReference, do we need to follow?")]
-#endif
                public void Save_Null ()
                {
                        icon.Save (null);
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Icon16ToBitmap Not Working")]
-#endif
                public void Icon16ToBitmap ()
                {
                        using (Bitmap b = icon16.ToBitmap ()) {
@@ -447,9 +403,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Icon32ToBitmap Not Working")]
-#endif
                public void Icon32ToBitmap ()
                {
                        using (Bitmap b = icon32.ToBitmap ()) {
@@ -464,9 +417,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Icon48ToBitmap Not Working")]
-#endif
                public void Icon48ToBitmap ()
                {
                        using (Bitmap b = icon48.ToBitmap ()) {
@@ -481,9 +431,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Icon64ToBitmap Not Working")]
-#endif
                public void Icon64ToBitmap ()
                {
                        using (Bitmap b = icon64.ToBitmap ()) {
@@ -498,9 +445,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Icon96ToBitmap Not Working")]
-#endif
                public void Icon96ToBitmap ()
                {
                        using (Bitmap b = icon96.ToBitmap ()) {
@@ -515,9 +459,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test] // bug #415581
-#if TARGET_JVM
-               [Ignore ("Icon256ToBitmap Not Working")]
-#endif
                public void Icon256ToBitmap ()
                {
                        using (FileStream fs = File.OpenRead (TestBitmap.getInFile ("bitmaps/415581.ico"))) {
@@ -572,38 +513,23 @@ namespace MonoTests.System.Drawing {
 #if NET_2_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("ExtractAssociatedIcon is not implemented")]
-#endif
                public void ExtractAssociatedIcon_Null ()
                {
-#if !TARGET_JVM
                        Icon.ExtractAssociatedIcon (null);
-#endif
                }
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("ExtractAssociatedIcon is not implemented")]
-#endif
                public void ExtractAssociatedIcon_Empty ()
                {
-#if !TARGET_JVM
                        Icon.ExtractAssociatedIcon (String.Empty);
-#endif
                }
 
                [Test]
                [ExpectedException (typeof (FileNotFoundException))]
-#if TARGET_JVM
-               [Ignore ("ExtractAssociatedIcon is not implemented")]
-#endif
                public void ExtractAssociatedIcon_DoesNotExists ()
                {
-#if !TARGET_JVM
                        Icon.ExtractAssociatedIcon ("does-not-exists.png");
-#endif
                }
 #endif
 
@@ -617,11 +543,7 @@ namespace MonoTests.System.Drawing {
        }
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("Unsafe code is not supported")]
-#endif 
        public class IconFullTrustTest {
-#if !TARGET_JVM
 #if NET_2_0
                [Test]
                public void ExtractAssociatedIcon ()
@@ -721,6 +643,5 @@ namespace MonoTests.System.Drawing {
                                IconTest.SaveAndCompare ("HICON", icon3, false);
                        }
                }
-#endif
        }
 }
index 76e5098cf1b655c81f11055c0e6014540c178fa0..6fcfadabe48a76593c6bfa70686c084bdf3cfa71 100644 (file)
@@ -81,9 +81,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (icoConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@@ -115,9 +112,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertTo ()
                {
                        Assert.IsTrue (icoConv.CanConvertTo (typeof (String)), "CCT#1");
@@ -151,9 +145,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertFrom ()
                {
                        Icon newIcon = (Icon) icoConv.ConvertFrom (null, CultureInfo.InvariantCulture, iconBytes);
@@ -264,9 +255,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertTo ()
                {
                        Assert.AreEqual (iconStr, (String) icoConv.ConvertTo (null,
index 94a71a8cbbbae3e10b3d4a87b5ce44dc356701d0..4176be6e7149a6f6cb38b7548303f5f676207a4b 100644 (file)
@@ -77,9 +77,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (imgConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@@ -111,9 +108,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertTo ()
                {
                        Assert.IsTrue (imgConv.CanConvertTo (typeof (String)), "CCT#1");
@@ -147,9 +141,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFrom ()
                {
                        Image newImage = (Image) imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, imageBytes);
@@ -166,9 +157,6 @@ namespace MonoTests.System.Drawing
                }
                
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_BadString ()
                {
@@ -176,9 +164,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_BadString_WithCulture ()
                {
@@ -186,9 +171,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_Bitmap ()
                {
@@ -196,9 +178,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_Point ()
                {
@@ -206,9 +185,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_SizeF ()
                {
@@ -216,9 +192,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertFrom_Object ()
                {
@@ -226,9 +199,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_BadString ()
                {
@@ -236,9 +206,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_BadString_Culture ()
                {
@@ -246,9 +213,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_Bitmap ()
                {
@@ -256,9 +220,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_Point ()
                {
@@ -266,9 +227,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_SizeF ()
                {
@@ -276,9 +234,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertFrom_Object ()
                {
@@ -286,9 +241,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertTo ()
                {
                        Assert.AreEqual (imageStr, (String) imgConv.ConvertTo (null, CultureInfo.InvariantCulture,
@@ -326,9 +278,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Rectangle ()
                {
@@ -336,9 +285,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Image ()
                {
@@ -346,9 +292,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Size ()
                {
@@ -356,9 +299,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Bitmap ()
                {
@@ -366,9 +306,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Point ()
                {
@@ -376,9 +313,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Metafile ()
                {
@@ -386,9 +320,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Object ()
                {
@@ -396,9 +327,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void ConvertTo_Int ()
                {
@@ -406,9 +334,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Rectangle ()
                {
@@ -416,9 +341,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Image ()
                {
@@ -426,9 +348,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Size ()
                {
@@ -436,9 +355,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Bitmap ()
                {
@@ -446,9 +362,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Point ()
                {
@@ -456,9 +369,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Metafile ()
                {
@@ -466,9 +376,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Object ()
                {
@@ -476,9 +383,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (NotSupportedException))]
                public void TypeDescriptor_ConvertTo_Int ()
                {
@@ -486,9 +390,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetPropertiesSupported ()
                {
                        Assert.IsTrue (imgConv.GetPropertiesSupported (), "GPS#1");
@@ -496,9 +397,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetProperties ()
                {
 #if NET_2_0
index f4e3cdd3019de7bba96c6a9a32b0cb9421d350c3..b96d2065395b64e8184545cd255b4ae3a896852f 100644 (file)
@@ -63,9 +63,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (ptconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -97,9 +94,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (pt, (Point) ptconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -280,9 +274,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -325,9 +316,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -341,9 +329,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -367,9 +352,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {
index 9a9176339786cca19b01417588c37c083c594bb1..9f48a9e623a2ae1beb1cac9dfcae532095942e7b 100644 (file)
@@ -69,9 +69,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (rconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -103,9 +100,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (rect, (Rectangle) rconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -334,9 +328,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -394,9 +385,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -410,9 +398,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -438,9 +423,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {
index 7a12e92b94c41dcf31dc2ece14d13cc7351ed4f1..29bb158d5f451eeebb717e899454ca5258457fab 100644 (file)
@@ -85,9 +85,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestCloneAndEquals()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -122,9 +119,6 @@ namespace MonoTests.System.Drawing
 
                 /*Tests infinite, empty, etc*/
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestInfiniteAndEmpty()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -160,9 +154,6 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestUnionGroup1 ()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -316,9 +307,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestUnionGroup2 ()
                {
                        RectangleF[] rects;
@@ -466,9 +454,6 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestComplementGroup1 ()
                {
                        RectangleF[] rects;
@@ -573,9 +558,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestComplementGroup2 ()
                {
 
@@ -614,9 +596,6 @@ namespace MonoTests.System.Drawing
 
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestExcludeGroup1 ()
                {
                        RectangleF[] rects;
@@ -880,9 +859,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestExcludeGroup2 ()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -912,9 +888,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void ExcludeBug402613 ()
                {
                        Region r = new Region();
@@ -925,9 +898,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestIntersect()
                {
 
@@ -972,9 +942,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestXor()
                {
                        Bitmap bmp = new Bitmap (600, 800);
@@ -1064,9 +1031,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void TestTranslate()
                {
                        Region rgn1 = new Region (new RectangleF (10, 10, 120,120));
@@ -1085,9 +1049,6 @@ namespace MonoTests.System.Drawing
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Constructor_GraphicsPath_Null ()
                {
                        GraphicsPath gp = null;
@@ -1096,9 +1057,6 @@ namespace MonoTests.System.Drawing
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Constructor_RegionData_Null ()
                {
                        RegionData rd = null;
@@ -1204,27 +1162,18 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_IntIntNull ()
                {
                        Assert.IsTrue (new Region ().IsVisible (0, 0, null));
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_IntIntIntIntNull ()
                {
                        Assert.IsFalse (new Region ().IsVisible (0, 0, 0, 0, null));
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_PointNull ()
                {
                        Point p = new Point ();
@@ -1232,9 +1181,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_PointFNull ()
                {
                        PointF p = new PointF ();
@@ -1242,9 +1188,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_RectangleNull ()
                {
                        Rectangle r = new Rectangle ();
@@ -1252,9 +1195,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_RectangleFNull ()
                {
                        RectangleF r = new RectangleF ();
@@ -1262,18 +1202,12 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_SingleSingleNull ()
                {
                        Assert.IsTrue (new Region ().IsVisible (0f, 0f, null));
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void IsVisible_SingleSingleSingleSingleNull ()
                {
                        Assert.IsFalse (new Region ().IsVisible (0f, 0f, 0f, 0f, null));
@@ -1294,9 +1228,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (ArgumentNullException))]
                public void Equals_NullGraphics ()
                {
@@ -1319,9 +1250,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                [ExpectedException (typeof (ArgumentNullException))]
                public void GetRegionScans_Null ()
                {
@@ -1349,9 +1277,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Region_Empty ()
                {
                        Region region = new Region ();
@@ -1388,9 +1313,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void Rectangle_GetRegionScans ()
                {
                        Matrix matrix = new Matrix ();
@@ -1579,12 +1501,8 @@ namespace MonoTests.System.Drawing
        }
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("Unsafe code is not supported")]
-#endif
        // the test cases in this fixture aren't restricted wrt running unmanaged code
        public class RegionTestUnmanaged {
-#if !TARGET_JVM
                private Bitmap bitmap;
                private Graphics graphic;
 
@@ -1687,7 +1605,6 @@ namespace MonoTests.System.Drawing
                        Assert.IsFalse (IntPtr.Zero == ptr, "ptr");
                        r.ReleaseHrgn (ptr);
                }
-#endif
 #endif
        }
 }
index 56ccc9cb95bfe9f6b987fb3807c5f667e05143b3..7b0f751b612a7e904ae86c681a86398acabd97f8 100644 (file)
@@ -64,9 +64,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (szconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -98,9 +95,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (sz, (Size) szconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -283,9 +277,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -330,9 +321,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -346,9 +334,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -374,9 +359,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {
index edb0f74ccd05b2e7e2aa9f180c4216107fa41ee4..63c1a1410b9a8dda5192621af85b8dbca1080a9f 100644 (file)
@@ -66,9 +66,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestCanConvertFrom ()
                {
                        Assert.IsTrue (szconv.CanConvertFrom (typeof (String)), "CCF#1");
@@ -100,9 +97,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestConvertFrom ()
                {
                        Assert.AreEqual (sz, (SizeF) szconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -284,9 +278,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TestGetProperties ()
                {
                        Attribute [] attrs;
@@ -331,9 +322,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_string_exc_2 ()
                {
                        try {
@@ -347,9 +335,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string ()
                {
                        // save current culture
@@ -375,9 +360,6 @@ namespace MonoTests.System.Drawing
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_string_exc_2 ()
                {
                        try {
index 31aaf102111b94680eec9e14249229a4a0c5442a..e8b68c56f4d3eaf7702952dde3af77ea941fe6c2 100644 (file)
@@ -67,9 +67,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void Default_Dispose ()
                {
                        StringFormat sf = new StringFormat ();
@@ -93,9 +90,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ctor_StringFormatFlags ()
                {
                        using (StringFormat sf = new StringFormat ((StringFormatFlags)Int32.MinValue)) {
@@ -104,9 +98,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ctor_StringFormatFlags_Int32 ()
                {
                        using (StringFormat sf = new StringFormat ((StringFormatFlags) Int32.MinValue, Int32.MinValue)) {
@@ -130,9 +121,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void GenericDefault_Local_Dispose ()
                {
                        StringFormat sf = StringFormat.GenericDefault;
@@ -168,9 +156,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void GenericTypographic_Local_Dispose ()
                {
                        StringFormat sf = StringFormat.GenericTypographic;
@@ -191,9 +176,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (InvalidEnumArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void Alignment_Invalid ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -214,9 +196,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (InvalidEnumArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void HotkeyPrefix_Invalid ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -237,9 +216,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (InvalidEnumArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void LineAlignment_Invalid ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -260,9 +236,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (InvalidEnumArgumentException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void Trimming_Invalid ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -281,9 +254,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void Clone_Complex ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -321,9 +291,6 @@ namespace MonoTests.System.Drawing{
                }               
                
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void TabsStops() 
                {
                        using (StringFormat smf = new StringFormat ()) {
@@ -345,9 +312,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (NullReferenceException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void SetTabStops_Null ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -356,9 +320,6 @@ namespace MonoTests.System.Drawing{
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void SetDigitSubstitution ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -370,9 +331,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (NullReferenceException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void SetMeasurableCharacterRanges_Null ()
                {
                        using (StringFormat sf = new StringFormat ()) {
@@ -400,9 +358,6 @@ namespace MonoTests.System.Drawing{
 
                [Test]
                [ExpectedException (typeof (OverflowException))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void SetMeasurableCharacterRanges_TooBig ()
                {
                        using (StringFormat sf = new StringFormat ()) {
index bd93a4debbba02461fe4734cb1733d83edb0a8c2..fd9d08db646498f4d86e0ab2417b92a1739d15f0 100644 (file)
@@ -56,10 +56,8 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-#if !TARGET_JVM
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CLSCompliant (false)]
index 0e7efffeed4beb9025ae97340b06c7a52f2f314f..f5a8ce25922d1912d4071a20befdfd46348b3703 100644 (file)
@@ -65,10 +65,8 @@ namespace System.Runtime.Remoting.Channels.Tcp
 \r
                public static void Shutdown ()\r
                {\r
-#if !TARGET_JVM\r
                        if (_poolThread != null)\r
                                _poolThread.Abort();\r
-#endif\r
                }\r
 \r
                public static int MaxOpenConnections\r
index 9ca8bba321d6f5aa872a886f0b2232079b2906fd..cab5d34208680ac5f12accbe69744d2238c513cc 100644 (file)
@@ -56,9 +56,6 @@ namespace System.Runtime.Remoting.Channels.Tcp
                
                RemotingThreadPool threadPool;
                
-#if TARGET_JVM
-               private volatile bool stopped = false;
-#endif
 
                void Init (IServerChannelSinkProvider serverSinkProvider)
                {
@@ -207,11 +204,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
                {
                        try
                        {
-#if !TARGET_JVM
                                while(true)
-#else
-                               while(!stopped)
-#endif
                                {
                                        Socket socket = listener.AcceptSocket ();
                                        ClientConnection reader = new ClientConnection (this, socket, sink);
@@ -236,9 +229,6 @@ namespace System.Runtime.Remoting.Channels.Tcp
 
                public void StartListening (object data)
                {
-#if TARGET_JVM
-                       stopped = false;
-#endif 
                        listener = new TcpListener (bindAddress, port);
                        if (server_thread == null) 
                        {
@@ -261,16 +251,9 @@ namespace System.Runtime.Remoting.Channels.Tcp
 
                public void StopListening (object data)
                {
-#if TARGET_JVM
-                       stopped = true;
-#endif 
                        if (server_thread == null) return;
                        
-#if !TARGET_JVM
                        server_thread.Abort ();
-#else
-                       server_thread.Interrupt ();
-#endif
                        listener.Stop ();
                        threadPool.Free ();
                        server_thread.Join ();
index 7da3a54c3cef1d991e171f38694dd0c5c46410bc..400fabd8fac05defafe8b7667ae3ac06e9fd952d 100644 (file)
@@ -98,13 +98,8 @@ namespace System.Runtime.Remoting.Channels
                        RemotingSurrogateSelector surrogateSelector = new RemotingSurrogateSelector ();
                        StreamingContext context = new StreamingContext (StreamingContextStates.Remoting, null);
 
-#if !TARGET_JVM
                        _serializationFormatter = new BinaryFormatter (surrogateSelector, context);
                        _deserializationFormatter = new BinaryFormatter (null, context);
-#else
-                       _serializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (surrogateSelector, context, false);
-                       _deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
-#endif
                        
                        _serializationFormatter.FilterLevel = _filterLevel;
                        _deserializationFormatter.FilterLevel = _filterLevel;
index aa99a6554872244ad712418160a8fe74aa1ab473..123cbaf860e90197147ce944e1943ccc059bf010 100644 (file)
@@ -46,9 +46,6 @@ namespace System.Runtime.Remoting.Channels
                AutoResetEvent threadDone = new AutoResetEvent (false);
                ArrayList runningThreads = new ArrayList ();
                 
-#if TARGET_JVM
-               volatile 
-#endif
                bool stopped = false;
                
                static object globalLock = new object ();
@@ -75,11 +72,7 @@ namespace System.Runtime.Remoting.Channels
                                        threadDone.Set ();
                                        workItems.Clear ();
                                        foreach (Thread t in runningThreads)
-#if !TARGET_JVM
                                                t.Abort ();
-#else
-                                               t.Interrupt();
-#endif
                                        runningThreads.Clear ();
                                }
                                if (this == sharedPool)
@@ -138,12 +131,7 @@ namespace System.Runtime.Remoting.Channels
                
                void PoolThread ()
                {
-#if !TARGET_JVM
                        while (true) {
-#else
-                       while (!stopped) 
-                       {
-#endif
                                ThreadStart work = null;
                                do {
                                        lock (workItems) {
index 85c71a1c0264c558a0a260a5e401901f2db11e94..055824f950553b5d7134972d6ae6f132f38da792 100644 (file)
@@ -74,34 +74,6 @@ namespace System.Runtime.Remoting.Channels {
                        if (sf != null) {\r
                                if(_serverFaultExceptionField != null)\r
                                        e = (Exception) _serverFaultExceptionField.GetValue(sf);\r
-#if TARGET_JVM                         \r
-                               if (e == null && sf.ExceptionType != null)\r
-                               {\r
-                                       try\r
-                                       {\r
-                                               Type te = Type.GetType(sf.ExceptionType);\r
-                                               if (te != null)\r
-                                               {\r
-                                                       ConstructorInfo ce = te.GetConstructor(\r
-                                                               BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.CreateInstance,\r
-                                                               null, new Type[] {typeof(string)}, null);\r
-\r
-                                                       if (ce != null)\r
-                                                       {\r
-                                                               e = (Exception) ce.Invoke(new object[] {sf.ExceptionMessage});\r
-                                                       }\r
-                                                       else\r
-                                                       {\r
-                                                               e = (Exception) Activator.CreateInstance(te);\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                                       catch\r
-                                       {\r
-                                               e = null;\r
-                                       }\r
-                               }\r
-#endif\r
                        }\r
                        if (e == null)\r
                                e = new RemotingException (fault.FaultString);\r
@@ -431,12 +403,6 @@ namespace System.Runtime.Remoting.Channels {
                \r
                object GetNullValue (Type paramType)\r
                {\r
-#if TARGET_JVM                 \r
-                       if (paramType.IsEnum)\r
-                       {\r
-                               return Activator.CreateInstance(paramType);\r
-                       }\r
-#endif\r
                        switch (Type.GetTypeCode (paramType))\r
                        {\r
                                case TypeCode.Boolean: return false;\r
@@ -453,12 +419,6 @@ namespace System.Runtime.Remoting.Channels {
                                case TypeCode.UInt32: return (uint)0;\r
                                case TypeCode.UInt64: return (ulong)0;\r
                                default: \r
-#if TARGET_JVM                 \r
-                                       if (paramType.IsValueType)\r
-                                       {\r
-                                               return Activator.CreateInstance(paramType);\r
-                                       }\r
-#endif                                 \r
                                        return null;\r
                        }\r
                }\r
index f8dcf058f67663a26e6770a61ea94d718246ffd2..703b97fd8281f8a2b078e7c9cb9e5693e08b3a02 100644 (file)
@@ -35,10 +35,8 @@ using System.Text;
 using System.Xml;
 using System.Reflection;
 using System.Net;
-#if !TARGET_JVM
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
-#endif
 
 namespace System.Runtime.Remoting.MetadataServices
 {
@@ -56,7 +54,6 @@ namespace System.Runtime.Remoting.MetadataServices
                {
                }
 
-#if !TARGET_JVM
                [MonoTODO ("strong name")]
                public static void ConvertCodeSourceFileToAssemblyFile (
                                   string codePath,
@@ -133,7 +130,6 @@ namespace System.Runtime.Remoting.MetadataServices
                        memStream.Position = 0;
                        cg.GenerateCode (clientProxy, outputDirectory, memStream, outCodeStreamList, proxyUrl, proxyNamespace);
                }
-#endif
 
                public static void ConvertTypesToSchemaToFile (ServiceType [] types, SdlType sdlType, string path)
                {
index cf07f16e8c557b3f3489a287741448321df4be29..645e25adde19375e7038aa7b25ce17c3b0ba11cc 100644 (file)
@@ -53,11 +53,9 @@ using System.Runtime.InteropServices;
 
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: ComVisible (true)]
index d2a076e4b82a48961fd0197dfdc89ff28de70a4d..e55f763132ea24a5061c6a5795d9d50e4499cb5a 100644 (file)
@@ -499,7 +499,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        object objReturn = \r
                                FormatterServices.GetUninitializedObject(type);\r
 \r
-#if NET_2_0 && !TARGET_JVM\r
+#if NET_2_0\r
                        objMgr.RaiseOnDeserializingEvent (objReturn);\r
 #endif\r
                        if(objReturn is ISerializable)\r
index 1bc703e216f67314855e70cb54523e91452170cb..ceb67d53c1fe60ef3a91f8bb20079a2feac09473 100644 (file)
@@ -84,7 +84,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                private FormatterAssemblyStyle _assemblyFormat = FormatterAssemblyStyle.Full;\r
                private FormatterTypeStyle _typeFormat = FormatterTypeStyle.TypesWhenNeeded;\r
                private static string defaultMessageNamespace;\r
-#if NET_2_0 && !TARGET_JVM\r
+#if NET_2_0\r
                SerializationObjectManager _manager;\r
 #endif\r
 \r
@@ -106,7 +106,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        _xmlWriter.Formatting = Formatting.Indented;\r
                        _surrogateSelector = selector;\r
                        _context = context;\r
-#if NET_2_0 && !TARGET_JVM\r
+#if NET_2_0\r
                        _manager = new SerializationObjectManager (_context);\r
 #endif\r
                }\r
@@ -207,7 +207,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                                Thread.CurrentThread.CurrentCulture = savedCi;\r
                        }\r
 \r
-#if NET_2_0 && !TARGET_JVM\r
+#if NET_2_0\r
                        _manager.RaiseOnSerializedEvent ();\r
 #endif\r
                }\r
@@ -373,7 +373,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        }\r
                        if(currentObject is ISerializable || surrogate != null) needsSerializationInfo = true;\r
 \r
-#if NET_2_0 && !TARGET_JVM\r
+#if NET_2_0\r
                        _manager.RegisterObject (currentObject);\r
 #endif\r
 \r
index 6f48fbc392673988ba48f8c090f2c8b474f77ccf..dc036a32be80f1bed036c92aeb7388b815a9bb98 100644 (file)
@@ -55,11 +55,9 @@ using System.Security.Permissions;
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: BestFitMapping (false)]
index b412d40fef0321b48bc868a5b3c2ba85b89ba157..ac4763edfbfe2b4be95a52d181c98a91755b9908 100644 (file)
@@ -57,7 +57,7 @@ using System.Security;
 
 [assembly: NeutralResourcesLanguage ("en-US")]
 
-#if !(TARGET_JVM || TARGET_DOTNET)
+#if !(TARGET_DOTNET)
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../winfx.pub")]
index 53bce36c63ad18133e3a045b04d852ae4f2461ad..905c63c4e7f5a1f5ab6e510a6b4f86bf18a75c85 100644 (file)
@@ -59,7 +59,7 @@ using System.Security.Permissions;
 
 [assembly: NeutralResourcesLanguage ("en-US")]
 
-#if !(TARGET_JVM || TARGET_DOTNET)
+#if !(TARGET_DOTNET)
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../winfx.pub")]
index 3ec1c00cc9bbc3b162ee3f94c28682d3e7fd47ff..3961c95284595038ea6d7a73a3167c59bd949046 100644 (file)
@@ -211,18 +211,12 @@ namespace System.Web.Handlers
                                                rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);\r
                                        }\r
                                        catch (MissingManifestResourceException) {\r
-#if TARGET_JVM // GetResourceSet does not throw  MissingManifestResourceException if ressource is not exists\r
-                                       }\r
-                                       if (rset == null) {\r
-#endif\r
                                                if (scriptResourceName.EndsWith (".resources", RuntimeHelpers.StringComparison)) {\r
                                                        scriptResourceName = scriptResourceName.Substring (0, scriptResourceName.Length - 10);\r
                                                        rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);\r
                                                }\r
-#if !TARGET_JVM\r
                                                else\r
                                                        throw;\r
-#endif\r
                                        }\r
                                        if (rset == null)\r
                                                break;\r
index 9836cca9209fec406e13b0619941c409c75f0a52..76e841fc5abc1367c259eca4e7623224a86349d8 100644 (file)
@@ -55,9 +55,7 @@ namespace System.Web.Script.Services
                                if (url.EndsWith (AuthenticationService.DefaultWebServicePath, StringComparison.Ordinal))
                                        handlerType = typeof(AuthenticationService);
                                else {
-#if !TARGET_JVM
                                        handlerType = BuildManager.GetCompiledType (url);
-#endif
                                        if (handlerType == null)
                                                handlerType = WebServiceParser.GetCompiledType (url, context);
                                }
index 69d065ec5fda66585783c29dd59a6a4a876a46a0..f4a78612162fb9f6f3a4993dbab2f09752c57e3a 100644 (file)
@@ -90,11 +90,7 @@ namespace Tests.System.Web.UI
                        scd.AddComponentProperty ("myName2", "myCompId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"}, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"}, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -105,11 +101,7 @@ namespace Tests.System.Web.UI
                        scd.AddElementProperty ("myName2", "myElemId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -120,11 +112,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", "myValue2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -135,11 +123,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", null);
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -150,11 +134,7 @@ namespace Tests.System.Web.UI
                        scd.AddEvent ("myName2", "myHandler2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -165,11 +145,7 @@ namespace Tests.System.Web.UI
                        scd.AddScriptProperty ("myName2", "myScript2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Test]
index cbf47d716e20fb9adfb33878fb56ca708383f6a0..0e4fb3abbaf8690a13746714aad84ab01e1c6b4f 100644 (file)
@@ -84,11 +84,7 @@ namespace Tests.System.Web.UI
                        scd.AddComponentProperty ("myName2", "myCompId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"});", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"});", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -99,11 +95,7 @@ namespace Tests.System.Web.UI
                        scd.AddElementProperty ("myName2", "myElemId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null);", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null);", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -114,11 +106,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", "myValue2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null);", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null);", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -129,11 +117,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", null);
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null);", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null);", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -144,11 +128,7 @@ namespace Tests.System.Web.UI
                        scd.AddEvent ("myName2", "myHandler2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null);", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null);", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -159,11 +139,7 @@ namespace Tests.System.Web.UI
                        scd.AddScriptProperty ("myName2", "myScript2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null);", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null);", script);
-#endif
                }
 
                [Test]
index 8df2646880e70b375bae750b05c2bb8bade28992..98c155b7e0407b80f568ea3eb60dfdaa577a9f06 100644 (file)
@@ -80,11 +80,7 @@ namespace Tests.System.Web.UI
                        scd.AddComponentProperty ("myName2", "myCompId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"}, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"}, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -95,11 +91,7 @@ namespace Tests.System.Web.UI
                        scd.AddElementProperty ("myName2", "myElemId2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -110,11 +102,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", "myValue2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -125,11 +113,7 @@ namespace Tests.System.Web.UI
                        scd.AddProperty ("myName2", null);
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -140,11 +124,7 @@ namespace Tests.System.Web.UI
                        scd.AddEvent ("myName2", "myHandler2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Category("NotWorking")] // One must not depend on the order of keys in dictionary
@@ -155,11 +135,7 @@ namespace Tests.System.Web.UI
                        scd.AddScriptProperty ("myName2", "myScript2");
 
                        string script = scd.DoGetScript ();
-#if TARGET_JVM
-                       Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null, $get(\"Element1\"));", script);
-#else
                        Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null, $get(\"Element1\"));", script);
-#endif
                }
 
                [Test]
index b9b695d0229b2c1853665c3975dd8fad98d94bc9..a40578640639cf89fb28892b1bae88102bd07932 100644 (file)
@@ -54,11 +54,9 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../msfinal.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
index e642a6202ddd3494a99b7c06912adf8b042b48b5..c4936a4bb34f1bc15e6639730b49a83d9339b53e 100644 (file)
@@ -50,19 +50,7 @@ namespace System.Web.Services.Configuration
        
        class WSConfig
        {
-#if !TARGET_JVM
                volatile static WSConfig instance;
-#else
-               static WSConfig instance {
-                       get {
-                               return (WSConfig)AppDomain.CurrentDomain.GetData("WSConfig.instance");
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData("WSConfig.instance", value);
-                       }
-               }
-
-#endif
                WSProtocol protocols;
                string wsdlHelpPage;
                string filePath;
index 0d321e7725aaae77e5b79d04c3aec737a60b6633..ede0ad15ec73243bb1e9c60e3bf3348afdd5574b 100644 (file)
@@ -35,9 +35,7 @@ using System.Xml;
 namespace System.Web.Services.Description {
        public sealed class ServiceDescriptionCollection : ServiceDescriptionBaseCollection {
 
-#if !TARGET_JVM //code generation is not supported
                ServiceDescriptionImporter importer;
-#endif
                
                #region Constructors
        
@@ -69,12 +67,10 @@ namespace System.Web.Services.Description {
                #endregion // Properties
 
                #region Methods
-#if !TARGET_JVM //code generation is not supported
                internal void SetImporter (ServiceDescriptionImporter i)
                {
                        importer = i;
                }
-#endif
                public int Add (ServiceDescription serviceDescription) 
                {
                        Insert (Count, serviceDescription);
index 69e87d037ad04547118bdbab88a457725746c949..9a1832792fdf55bf913eb3bc5a12f0bdb848ca56 100644 (file)
@@ -2479,7 +2479,6 @@ namespace System.Web.Services.Description
                }
        }
 
-       #if !TARGET_JVM
        internal class XmlSerializerContract : System.Xml.Serialization.XmlSerializerImplementation
        {
                System.Collections.Hashtable readMethods = null;
@@ -2550,7 +2549,6 @@ namespace System.Web.Services.Description
                }
        }
 
-       #endif
 }
 
 #endif
index a73d6d235b19bb5df426ea6aee3c7184093e690c..f13e0cf12715e47372abe575b27ebc93a138ed94 100644 (file)
@@ -35,18 +35,7 @@ namespace System.Web.Services.Description {
        public abstract class SoapTransportImporter {
 
                #region Fields
-#if !TARGET_JVM
                static ArrayList transportImporters;
-#else
-               static ArrayList transportImporters {
-                       get {
-                               return (ArrayList)AppDomain.CurrentDomain.GetData("SoapTransportImporter.transportImporters");
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData("SoapTransportImporter.transportImporters", value);
-                       }
-               }
-#endif
                SoapProtocolImporter importContext;
 
                #endregion // Fields
index 178161b1c95c0c7a836f3d770efff2511fb2f7cd..66d88ee943b355a677bdded92e36854402ac9e6e 100644 (file)
@@ -100,10 +100,8 @@ namespace System.Web.Services.Protocols
 
                        string physPath = Path.Combine (path, help);
                        
-#if !TARGET_JVM
                        if (!File.Exists (physPath))
                                throw new InvalidOperationException ("Documentation page '" + physPath + "' not found");
-#endif
 
                        _pageHandler = PageParser.GetCompiledPageInstance (vpath, physPath, context);
                }
@@ -137,11 +135,7 @@ namespace System.Web.Services.Protocols
 
                                if (key  == "wsdl") GenerateWsdlDocument (context, req.QueryString ["wsdl"]);
                                else if (key == "schema") GenerateSchema (context, req.QueryString ["schema"]);
-#if !TARGET_JVM //code generation is not supported
                                else if (key == "code") GenerateCode (context, req.QueryString ["code"]);
-#else
-                               else if (key == "code") throw new Exception("Code generation is not supported.");
-#endif
                                else if (key == "disco") GenerateDiscoDocument (context);
                                else throw new Exception ("This should never happen");
                        }
@@ -212,7 +206,6 @@ namespace System.Web.Services.Protocols
                        GetSchemas() [di].Write (xtw);
                }
 
-#if !TARGET_JVM                
                void GenerateCode (HttpContext context, string langId)
                {
                        context.Response.ContentType = "text/plain; charset=utf-8";
@@ -256,7 +249,6 @@ namespace System.Web.Services.Protocols
 
                        return provider;
                }
-#endif
                
                internal ServiceDescriptionCollection GetDescriptions ()
                {
index 854cc1a4dce51a068cca3dc0634f3cafb0f98f57..66359e7994801caff0b82e66cdb58da6dc9baee8 100644 (file)
@@ -62,18 +62,7 @@ namespace System.Web.Services.Protocols {
                public abstract void ProcessMessage (SoapMessage message);
 
 
-#if !TARGET_JVM
                static ArrayList[] globalExtensions;
-#else
-               static ArrayList[] globalExtensions {
-                       get {
-                               return (ArrayList[])AppDomain.CurrentDomain.GetData("SoapExtension.globalExtensions");
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData("SoapExtension.globalExtensions", value);
-                       }
-               }
-#endif
 
                internal static SoapExtension[] CreateExtensionChain (SoapExtensionRuntimeConfig[] extensionConfigs)
                {
index 28d03f04f995c30454476d569a125ac56fa326d8..5ea34917e87b6b72120af0bb7dcd679afdd81a1c 100644 (file)
@@ -280,28 +280,7 @@ namespace System.Web.Services.Protocols {
        //
        internal class TypeStubManager 
        {
-#if !TARGET_JVM
                static Hashtable type_to_manager;
-#else
-               const string type_to_manager_key = "TypeStubManager.type_to_manager";
-               static Hashtable type_to_manager {
-                       get {
-                               Hashtable hash = (Hashtable)AppDomain.CurrentDomain.GetData(type_to_manager_key);
-
-                               if (hash != null)
-                                       return hash;
-
-                               lock(type_to_manager_key) {
-                                       AppDomain.CurrentDomain.SetData(type_to_manager_key, new Hashtable());
-                               }
-
-                               return (Hashtable)AppDomain.CurrentDomain.GetData(type_to_manager_key);
-                       }
-                       set {
-                               //do nothing: we manage our type_to_manager per domain
-                       }
-               }
-#endif
                
                static TypeStubManager ()
                {
index a5c125388866aecf33cf48c8048254cf57189a08..59bb8bfbd51c02958697cedbca5ff4080ff9f12e 100644 (file)
@@ -59,18 +59,7 @@ namespace System.Web.Services.Protocols {
                //
                WebRequest current_request;
                
-#if !TARGET_JVM
                static HybridDictionary cache;
-#else
-               static HybridDictionary cache {
-                       get {
-                               return (HybridDictionary)AppDomain.CurrentDomain.GetData("WebClientProtocol.cache");
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData("WebClientProtocol.cache", value);
-                       }
-               }
-#endif
                #endregion
 
                #region Constructors
index fd10eac8573d8969f6baff11dfc8b674bbac9add..37dc32ba65317e27f80515d3041353fa78845c8f 100644 (file)
@@ -106,7 +106,7 @@ namespace System.Web.Services.Protocols
 #endif
 
                        Type type;
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
                        type = BuildManager.GetCompiledType (url);
 #else
                        type = WebServiceParser.GetCompiledType (fp, context);
index 7baf1314ac197b9b8898d212e954f0469e6ae5b6..0b133b04193125fd76b7e186c9c46efe7249e852 100644 (file)
@@ -55,11 +55,7 @@ using System.Web.UI;
 #if !NET_4_0
 [assembly: AssemblyTrademark("")]
 #endif
-#if TARGET_JVM
-[assembly: CLSCompliant(false)]
-#else
 [assembly: CLSCompliant(true)]
-#endif
 [assembly: ComVisible(false)]
 [assembly: AssemblyDefaultAlias("System.Web.dll")]
 [assembly: AssemblyInformationalVersion("0.0.0.1")]
@@ -67,7 +63,7 @@ using System.Web.UI;
 
 [assembly: AllowPartiallyTrustedCallers()]
 [assembly: TagPrefix("System.Web.UI.WebControls", "asp")]
-#if !(TARGET_JVM || TARGET_DOTNET)
+#if !(TARGET_DOTNET)
 [assembly: AssemblyDelaySign(true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
index bd0fc291f3b31b2b93a36fc4a9044556134c6889..ee74b4ea645661787f2d17b1c0a9b836eb9c0e2f 100644 (file)
@@ -67,11 +67,9 @@ namespace System.Web.Configuration
                                                                    ConfigurationPropertyOptions.None);
                        assemblyPostProcessorTypeProp = new ConfigurationProperty ("assemblyPostProcessorType", typeof (string), "");
                        batchProp = new ConfigurationProperty ("batch", typeof (bool), true);
-#if !TARGET_JVM
                        buildProvidersProp = new ConfigurationProperty ("buildProviders", typeof (BuildProviderCollection), null,
                                                                        null, PropertyHelper.DefaultValidator,
                                                                        ConfigurationPropertyOptions.None);
-#endif
                        batchTimeoutProp = new ConfigurationProperty ("batchTimeout", typeof (TimeSpan), new TimeSpan (0, 15, 0),
                                                                      PropertyHelper.TimeSpanSecondsOrInfiniteConverter,
                                                                      PropertyHelper.PositiveTimeSpanValidator,
@@ -109,9 +107,7 @@ namespace System.Web.Configuration
                        properties.Add (assembliesProp);
                        properties.Add (assemblyPostProcessorTypeProp);
                        properties.Add (batchProp);
-#if !TARGET_JVM
                        properties.Add (buildProvidersProp);
-#endif
                        properties.Add (batchTimeoutProp);
                        properties.Add (codeSubDirectoriesProp);
                        properties.Add (compilersProp);
@@ -171,12 +167,10 @@ namespace System.Web.Configuration
                        set { base [batchTimeoutProp] = value; }
                }
 
-#if !TARGET_JVM
                [ConfigurationProperty ("buildProviders")]
                public BuildProviderCollection BuildProviders {
                        get { return (BuildProviderCollection) base [buildProvidersProp]; }
                }
-#endif
 
                [ConfigurationProperty ("codeSubDirectories")]
                public CodeSubDirectoriesCollection CodeSubDirectories {
index 959e2ce69169df1ce97b6f4c131208a43147da10..5d1ff36f882688f4189d37f4caf97c9e03842bb4 100644 (file)
@@ -65,12 +65,10 @@ namespace System.Web.Configuration
                        get { return (ClientTargetSection)Sections ["clientTarget"]; }
                }
 
-#if !TARGET_JVM
                [ConfigurationProperty ("compilation")]
                public CompilationSection Compilation {
                        get { return (CompilationSection)Sections ["compilation"]; }
                }
-#endif
 
                [ConfigurationProperty ("customErrors")]
                public CustomErrorsSection CustomErrors {
index be1814d62ae393a55f90bdf7374417653f8e96ec..4efb0e0b921214dac6ac4cb19bd856c64efd4f1a 100644 (file)
@@ -314,16 +314,12 @@ namespace System.Web.Handlers
                        extra = QueryParamSeparator + "n=" + (notifyScriptLoaded ? "t" : "f");
 #endif
 
-#if TARGET_JVM
-                       atime = QueryParamSeparator + "t=" + assemblyName.GetHashCode ();
-#else
                        if (includeTimeStamp) {
                                if (!String.IsNullOrEmpty (assemblyPath) && File.Exists (assemblyPath))
                                        atime = QueryParamSeparator + "t=" + File.GetLastWriteTimeUtc (assemblyPath).Ticks;
                                else
                                        atime = QueryParamSeparator + "t=" + DateTime.UtcNow.Ticks;
                        }
-#endif
                        string d = HttpUtility.UrlEncode (assemblyNameHash + "_" + resourceNameHash +  (debug ? "_t" : "_f"));
                        string href = HandlerFileName + "?d=" + d + atime + extra;
                        HttpContext ctx = HttpContext.Current;
index 7fc71250f09ee2a2effd0222a04bcd398d10fcbe..539056db3e3f7fd9103379280690cb6c740f33cc 100644 (file)
@@ -126,9 +126,6 @@ namespace System.Web.Hosting {
                //
                //    http://www.west-wind.com/presentations/aspnetruntime/aspnetruntime.asp
                // 
-#if TARGET_JVM
-               [MonoNotSupported ("")]
-#endif
                [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
                public static object CreateApplicationHost (Type hostType, string virtualDir, string physicalDir)
                {
index adbcf92aa5a533c5b82111b244445bd2cd50eafe..ad72d9f44eeef215f49ea96ccad2db074f740b99 100644 (file)
@@ -68,11 +68,6 @@ namespace System.Web.Mail {
                    
                void ChangeToSSLSocket ()
                {
-#if TARGET_JVM
-                       java.lang.Class c = vmw.common.TypeUtils.ToClass (smtp.Stream);
-                       java.lang.reflect.Method m = c.getMethod ("ChangeToSSLSocket", null);
-                       m.invoke (smtp.Stream, new object[]{});
-#else
                        // Load Mono.Security.dll
                        Assembly a;
                        try {
@@ -94,7 +89,6 @@ namespace System.Web.Mail {
 
                        if (objSslClientStream != null)
                                smtp = new SmtpStream ((Stream)objSslClientStream);
-#endif
                }
                
                void ReadFields (MailMessageWrapper msg)
index b8e7bfa11a4c4284930441cb4f82ff7e5ba63055..55d223b705689c01d097a2f6cba8539f3996475a 100644 (file)
@@ -114,26 +114,7 @@ namespace System.Web.Security {
                        }
                }
 
-#if TARGET_JVM
-               static AnonymousIdentificationSection Config
-               {
-                       get
-                       {
-                               AnonymousIdentificationSection config = (AnonymousIdentificationSection) AppDomain.CurrentDomain.GetData ("Anonymous.Config");
-                               if (config == null) {
-                                       lock (typeof (AnonymousIdentificationModule)) {
-                                               config = (AnonymousIdentificationSection) AppDomain.CurrentDomain.GetData ("Anonymous.Config");
-                                               if (config == null)
-                                                       config = (AnonymousIdentificationSection) WebConfigurationManager.GetSection ("system.web/anonymousIdentification");
-                                               AppDomain.CurrentDomain.SetData ("Anonymous.Config", config);
-                                       }
-                               }
-                               return config;
-                       }
-               }
-#else
                static AnonymousIdentificationSection Config = (AnonymousIdentificationSection) WebConfigurationManager.GetSection ("system.web/anonymousIdentification");
-#endif
        }
 }
 #endif
index a1b8f553a287c24847aac21c99c82ed80c5d79b7..e57513c761eed03b0a9ddeabb9fdc4d7894a6f9c 100644 (file)
@@ -35,9 +35,7 @@ namespace System.Web.UI.WebControls
 {
        [ToolboxItem (false)]
        [DesignerAttribute ("System.Web.UI.Design.WebControls.ContentDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-#if !TARGET_JVM
        [ControlBuilder(typeof(ContentBuilderInternal))]
-#endif
        public class Content: Control, INamingContainer, INonBindingContainer
        {
                [ThemeableAttribute (false)]
index 7f71951ba0041126ef5dbdf56d7b5871652f54b0..56bb47679f48eda778e2a826055fa740d4496655 100644 (file)
@@ -504,12 +504,7 @@ namespace System.Web.UI.WebControls
                
                public void ToggleExpandState ()
                {
-#if TARGET_JVM //No support for Nullable<bool>.GetValueOrDefault() yet
-                       bool? value = Expanded;
-                       Expanded = value.HasValue ? !value.Value : true;
-#else
                        Expanded = !Expanded.GetValueOrDefault(false);
-#endif
                }
 
                void IStateManager.LoadViewState (object savedState)
index 4cc18bd3a318605cec57a16e56db910bb8b21a73..45ce22e46e9fe5e50cbf3c0fded9fc049cdceccb 100644 (file)
@@ -133,10 +133,6 @@ namespace System.Web.UI {
                protected virtual void AddAttribute (string name, string value, HtmlTextWriterAttribute key)
                {
                        NextAttrStack ();
-#if TARGET_JVM
-                       if (attrs [attrs_pos] == null)
-                               attrs [attrs_pos] = new AddedAttr ();
-#endif
                        attrs [attrs_pos].name = name;
                        attrs [attrs_pos].value = value;
                        attrs [attrs_pos].key = key;
@@ -146,10 +142,6 @@ namespace System.Web.UI {
                protected virtual void AddStyleAttribute (string name, string value, HtmlTextWriterStyle key)
                {
                        NextStyleStack ();
-#if TARGET_JVM
-                       if (styles [styles_pos] == null)
-                               styles [styles_pos] = new AddedStyle ();
-#endif
                        styles [styles_pos].name = name;
                        value = HttpUtility.HtmlAttributeEncode (value);
                        styles [styles_pos].value = value;
@@ -765,10 +757,6 @@ namespace System.Web.UI {
                                return tagstack [tagstack_pos].key;
                        }
                        set {
-#if TARGET_JVM
-                               if (tagstack [tagstack_pos] == null)
-                                       tagstack [tagstack_pos] = new AddedTag ();
-#endif
                                tagstack [tagstack_pos].key = value;
                                tagstack [tagstack_pos].name = GetTagName (value);
                        }
@@ -782,10 +770,6 @@ namespace System.Web.UI {
                                return tagstack [tagstack_pos].name;
                        }
                        set {
-#if TARGET_JVM
-                               if (tagstack [tagstack_pos] == null)
-                                       tagstack [tagstack_pos] = new AddedTag ();
-#endif
                                tagstack [tagstack_pos].name = value;
                                tagstack [tagstack_pos].key = GetTagKey (value);
                                if (tagstack [tagstack_pos].key != HtmlTextWriterTag.Unknown)
@@ -828,33 +812,21 @@ namespace System.Web.UI {
 
                int styles_pos = -1, attrs_pos = -1, tagstack_pos = -1;
 
-#if TARGET_JVM
-               class
-#else
                struct 
-#endif
                AddedTag {
                        public string name;
                        public HtmlTextWriterTag key;
                        public bool ignore;
                }
 
-#if TARGET_JVM
-               class
-#else
                struct 
-#endif
                AddedStyle {
                        public string name;
                        public HtmlTextWriterStyle key;
                        public string value;
                }
 
-#if TARGET_JVM
-               class
-#else
                struct 
-#endif
                AddedAttr {
                        public string name;
                        public HtmlTextWriterAttribute key;
index 842c1ff880659eb7da81c6ea29c62b906a19f6ea..de727f794aa4cf974179f382446677dce09d6940 100644 (file)
@@ -34,7 +34,7 @@ using System.Text;
 
 namespace System.Web.UI
 {
-#if (TARGET_JVM || TARGET_DOTNET)
+#if (TARGET_DOTNET)
        public
 #endif
        interface IScriptManager
index d68be867801432cedef271c049800fb285190c26..2a08d709579effcd5db512fd2b50cf9435eec13f 100644 (file)
@@ -115,13 +115,7 @@ namespace System.Web.UI
                        var req = context.Request;
                        if (req != null)
                                masterPageFile = HostingEnvironment.VirtualPathProvider.CombineVirtualPaths (req.CurrentExecutionFilePath, masterPageFile);
-#if TARGET_JVM
-                       MasterPage masterPage = MasterPageParser.GetCompiledMasterInstance (masterPageFile,
-                                                                                           owner.Page.MapPath (masterPageFile),
-                                                                                           context);
-#else
                        MasterPage masterPage = BuildManager.CreateInstanceFromVirtualPath (masterPageFile, typeof (MasterPage)) as MasterPage;
-#endif
                        if (masterPage == null)
                                throw new HttpException ("Failed to create MasterPage instance for '" + masterPageFile + "'.");
 
index e6c79483a0d5b7c59b8b1679666df396cf4509cd..95919aba332cf60ff2aa9c68d0e729f13158b2b6 100644 (file)
@@ -544,15 +544,11 @@ public partial class Page : TemplateControl, IHttpHandler
                        if (ps != null)
                                _styleSheetTheme = ps.StyleSheetTheme;
                }
-#if TARGET_JVM
-               if (_styleSheetTheme != null && _styleSheetTheme != "")
-                       _styleSheetPageTheme = ThemeDirectoryCompiler.GetCompiledInstance (_styleSheetTheme, Context);
-#else
+
                if (!String.IsNullOrEmpty (_styleSheetTheme)) {
                        string virtualPath = "~/App_Themes/" + _styleSheetTheme;
                        _styleSheetPageTheme = BuildManager.CreateInstanceFromVirtualPath (virtualPath, typeof (PageTheme)) as PageTheme;
                }
-#endif 
        }
 
        void InitializeTheme ()
@@ -562,19 +558,13 @@ public partial class Page : TemplateControl, IHttpHandler
                        if (ps != null)
                                _theme = ps.Theme;
                }
-#if TARGET_JVM
-               if (_theme != null && _theme != "") {
-                       _pageTheme = ThemeDirectoryCompiler.GetCompiledInstance (_theme, Context);
-                       _pageTheme.SetPage (this);
-               }
-#else
+
                if (!String.IsNullOrEmpty (_theme)) {
                        string virtualPath = "~/App_Themes/" + _theme;
                        _pageTheme = BuildManager.CreateInstanceFromVirtualPath (virtualPath, typeof (PageTheme)) as PageTheme;
                        if (_pageTheme != null)
                                _pageTheme.SetPage (this);
                }
-#endif 
        }
 #if NET_4_0
        public Control AutoPostBackControl {
@@ -1298,11 +1288,7 @@ public partial class Page : TemplateControl, IHttpHandler
                OnError (EventArgs.Empty);
                if (_context.HasError (e)) {
                        _context.ClearError (e);
-#if TARGET_JVM
-                       vmw.common.TypeUtils.Throw (e);
-#else
                        throw new HttpUnhandledException (null, e);
-#endif
                }
        }
 
@@ -2277,26 +2263,6 @@ public partial class Page : TemplateControl, IHttpHandler
                        }
 
                        if (asyncResults.Count > 0) {
-#if TARGET_JVM
-                               TimeSpan timeout = AsyncTimeout;
-                               long t1 = DateTime.Now.Ticks;
-                               bool signalled = true;
-                               for (int i = 0; i < asyncResults.Count; i++) {
-                                       if (asyncResults [i].IsCompleted)
-                                               continue;
-
-                                       if (signalled)
-                                               signalled = asyncResults [i].AsyncWaitHandle.WaitOne (timeout, false);
-
-                                       if (signalled) {
-                                               long t2 = DateTime.Now.Ticks;
-                                               timeout = AsyncTimeout - TimeSpan.FromTicks (t2 - t1);
-                                               if (timeout.Ticks <= 0)
-                                                       signalled = false;
-                                       } else
-                                               localParallelTasks [i].TimeoutHandler (asyncResults [i]);
-                               }
-#else
                                WaitHandle [] waitArray = new WaitHandle [asyncResults.Count];
                                int i = 0;
                                for (i = 0; i < asyncResults.Count; i++) {
@@ -2311,7 +2277,6 @@ public partial class Page : TemplateControl, IHttpHandler
                                                }
                                        }
                                }
-#endif
                        }
                        DateTime endWait = DateTime.Now;
                        TimeSpan elapsed = endWait - startExecution;
index 6777340947706204d6fc7fbd60f5e87fdd55b74f..fa99694254553f2da59f2d9c97e8583c0c0bb59a 100644 (file)
@@ -69,15 +69,11 @@ namespace System.Web
                public override string Get (string name)
                {
                        if (!_loaded) {
-#if TARGET_JVM
-                               return InternalGet (name);
-#else
                                string s = InternalGet (name);
                                if (s != null && s.Length > 0)
                                        return s;
 
                                LoadInfo ();
-#endif
                        }
                                
                        return base.Get (name);         
index 46ef73cda8714fd5265404622d9a3f9075463283..d44c0878a2698f56160bb8d32e54f01614103a42 100644 (file)
@@ -51,11 +51,7 @@ namespace System.Web
                BrowserData parent;
                string text;
                string pattern;
-#if TARGET_JVM
-               java.util.regex.Pattern regex;
-#else
                Regex regex;
-#endif
                ListDictionary data;
 
                public BrowserData (string pattern)
@@ -153,17 +149,9 @@ namespace System.Web
 
                        lock (this_lock) {
                                if (regex == null)
-#if TARGET_JVM
-                                       regex = java.util.regex.Pattern.compile (pattern);
-#else
                                regex = new Regex (pattern);
-#endif
                        }
-#if TARGET_JVM
-                       return regex.matcher ((java.lang.CharSequence) (object) expression).matches ();
-#else
                        return regex.Match (expression).Success;
-#endif
                }
        }
        
@@ -173,46 +161,9 @@ namespace System.Web
                static Hashtable defaultCaps;
                static readonly object lockobj = new object ();
 
-#if TARGET_JVM
-               static bool loaded {
-                       get {
-                               return alldata != null;
-                       }
-                       set {
-                               if (alldata == null)
-                                       alldata = new ArrayList ();
-                       }
-               }
-
-               const string alldataKey = "System.Web.CapabilitiesLoader.alldata";
-               static ICollection alldata {
-                       get {
-                               return (ICollection) AppDomain.CurrentDomain.GetData (alldataKey);
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData (alldataKey, value);
-                       }
-               }
-
-               const string userAgentsCacheKey = "System.Web.CapabilitiesLoader.userAgentsCache";
-               static Hashtable userAgentsCache {
-                       get {
-                               lock (typeof (CapabilitiesLoader)) {
-                                       Hashtable agentsCache = (Hashtable) AppDomain.CurrentDomain.GetData (userAgentsCacheKey);
-                                       if (agentsCache == null) {
-                                               agentsCache = Hashtable.Synchronized (new Hashtable (userAgentsCacheSize + 10));
-                                               AppDomain.CurrentDomain.SetData (userAgentsCacheKey, agentsCache);
-                                       }
-
-                                       return agentsCache;
-                               }
-                       }
-               }
-#else
                static volatile bool loaded;
                static ICollection alldata;
                static Hashtable userAgentsCache = Hashtable.Synchronized(new Hashtable(userAgentsCacheSize+10));
-#endif
 
                CapabilitiesLoader () {}
 
index 47979167629b9e600b7c40f16415fccbbb688367..efa4432011abe6d4b43e9702e5ac531b10d944b3 100644 (file)
@@ -1277,10 +1277,6 @@ namespace System.Web
                                context.Handler = handler;
                                context.PushHandler (handler);
                        } catch (FileNotFoundException fnf){
-#if TARGET_JVM
-                               Console.WriteLine ("$$$$$$$$$$:Sys.Web Pipeline");
-                               Console.WriteLine (fnf.ToString ());
-#endif
                                if (context.Request.IsLocal)
                                        ProcessError (HttpException.NewWithCode (404,
                                                                                 String.Format ("File not found {0}", fnf.FileName),
@@ -1510,9 +1506,7 @@ namespace System.Web
                                        th.CurrentUICulture = new_app_culture;
                        }
 
-#if !TARGET_JVM
                        prev_user = Thread.CurrentPrincipal;
-#endif
                }
 
                void PostDone ()
@@ -1523,10 +1517,8 @@ namespace System.Web
                        }
 
                        Thread th = Thread.CurrentThread;
-#if !TARGET_JVM
                        if (Thread.CurrentPrincipal != prev_user)
                                Thread.CurrentPrincipal = prev_user;
-#endif
                        if (prev_appui_culture != null && prev_appui_culture != th.CurrentUICulture)
                                th.CurrentUICulture = prev_appui_culture;
                        if (prev_app_culture != null && prev_app_culture != th.CurrentCulture)
@@ -1672,11 +1664,7 @@ namespace System.Web
                        cultures [0] = Thread.CurrentThread.CurrentCulture;
                        cultures [1] = Thread.CurrentThread.CurrentUICulture;
                        
-#if TARGET_JVM
-                       if (true)
-#else
                        if (Thread.CurrentThread.IsThreadPoolThread)
-#endif
                                Start (null);
                        else
                                ThreadPool.QueueUserWorkItem (x => {
@@ -1816,7 +1804,6 @@ namespace System.Web
                        if (type != null)
                                return type;
 
-#if !TARGET_JVM
                        Assembly [] assemblies = AppDomain.CurrentDomain.GetAssemblies ();
                        foreach (Assembly ass in assemblies) {
                                type = ass.GetType (typeName, false);
@@ -1845,7 +1832,6 @@ namespace System.Web
                        
                        if (type != null)
                                return type;
-#endif
                        if (throwOnMissing)
                                throw new TypeLoadException (String.Format ("Type '{0}' cannot be found", typeName), loadException);
                        
index 7876e8e7a307c467a41742d2df668c25d5a2adb9..9b3a291640b16c98baebe282967f29992188a31d 100644 (file)
@@ -85,15 +85,7 @@ namespace System.Web
                [ThreadStatic]
                static Dictionary <string, IResourceProvider> resource_providers;
                
-#if TARGET_JVM
-               const string app_global_res_key = "HttpContext.app_global_res_key";
-               internal static Assembly AppGlobalResourcesAssembly {
-                       get { return (Assembly) AppDomain.CurrentDomain.GetData (app_global_res_key); }
-                       set { AppDomain.CurrentDomain.SetData (app_global_res_key, value); }
-               }
-#else
                internal static Assembly AppGlobalResourcesAssembly;
-#endif
                ProfileBase profile = null;
                LinkedList<IHttpHandler> handlers;
 
@@ -178,7 +170,6 @@ namespace System.Web
                // The "Current" property is set just after we have constructed it with 
                // the 'HttpContext (HttpWorkerRequest)' constructor.
                //
-#if !TARGET_JVM // No remoting CallContext support in Grasshopper
                public static HttpContext Current {
                        get {
                                return (HttpContext) CallContext.GetData ("c");
@@ -188,7 +179,6 @@ namespace System.Web
                                CallContext.SetData ("c", value);
                        }
                }
-#endif
 
                public Exception Error {
                        get {
@@ -228,11 +218,9 @@ namespace System.Web
                                return (cfg.Mode == CustomErrorMode.RemoteOnly) && !Request.IsLocal;
                        }
                }
-#if !TARGET_JVM
                public bool IsDebuggingEnabled {
                        get { return RuntimeHelpers.DebuggingEnabled; }
                }
-#endif
                public IDictionary Items {
                        get {
                                if (items == null)
index de51fc897a047aa28bed76a8b77f6339ce3a1b0d..a2dd750eff48c2cb49596be5b3919ce55551579e 100755 (executable)
@@ -289,11 +289,9 @@ namespace System.Web
                        }
                }
 
-#if !TARGET_JVM
                public WindowsIdentity LogonUserIdentity {
                        get { throw new NotImplementedException (); }
                }
-#endif
                
                string anonymous_id;
                public string AnonymousID {
@@ -580,10 +578,8 @@ namespace System.Web
                // GetSubStream returns a 'copy' of the InputStream with Position set to 0.
                static Stream GetSubStream (Stream stream)
                {
-#if !TARGET_JVM
                        if (stream is IntPtrStream)
                                return new IntPtrStream (stream);
-#endif
 
                        if (stream is MemoryStream) {
                                MemoryStream other = (MemoryStream) stream;
@@ -797,7 +793,6 @@ namespace System.Web
                        input_stream = new MemoryStream (ms.GetBuffer (), 0, (int) ms.Length, false, true);
                }
 
-#if !TARGET_JVM
                const int INPUT_BUFFER_SIZE = 32*1024;
 
                TempFileStream GetTempStream ()
@@ -951,7 +946,6 @@ namespace System.Web
                        if (total < content_length)
                                throw HttpException.NewWithCode (411, "The request body is incomplete.", WebEventCodes.WebErrorOtherError);
                }
-#endif
 
                internal void ReleaseResources ()
                {
@@ -1563,14 +1557,10 @@ namespace System.Web
                        
                        if (!isAppVirtualPath && !virtualPath.StartsWith (appVirtualPath, RuntimeHelpers.StringComparison))
                                throw new InvalidOperationException (String.Format ("Failed to map path '{0}'", virtualPath));
-#if TARGET_JVM
-                       return worker_request.MapPath (virtualPath);
-#else
                        string path = worker_request.MapPath (virtualPath);
                        if (virtualPath [virtualPath.Length - 1] != '/' && path [path.Length - 1] == System.IO.Path.DirectorySeparatorChar)
                                path = path.TrimEnd (System.IO.Path.DirectorySeparatorChar);
                        return path;
-#endif
                }
 
                public void SaveAs (string filename, bool includeHeaders)
index 2491c9035d1985800a69c257ab282dbb5e2708d8..65718e5cd9bc41494cc3ec01bc9f2e62c8d39309 100644 (file)
@@ -1157,11 +1157,6 @@ namespace System.Web
                        Flush ();
                }
 
-#if TARGET_JVM
-               public void WriteFile (IntPtr fileHandle, long offset, long size) {
-                       throw new PlatformNotSupportedException("IntPtr not supported");
-               }
-#else
                public void WriteFile (IntPtr fileHandle, long offset, long size)
                {
                        if (offset < 0)
@@ -1182,7 +1177,6 @@ namespace System.Web
                        output_stream.ApplyFilter (false);
                        Flush ();
                }
-#endif
 
                public void WriteFile (string filename, long offset, long size)
                {
index a7ec533a0e7296600b879bd59cbfceb46ddca2df..b180d341b5c15ec455699175802e6e46ca267b05 100644 (file)
@@ -75,75 +75,6 @@ namespace System.Web
                                filter = value;
                        }
                }
-#if TARGET_JVM
-
-               class BlockManager {
-                       const int PreferredLength = 16 * 1024;
-                       static readonly byte[] EmptyBuffer = new byte[0];
-
-                       byte[] buffer = EmptyBuffer;
-                       int position;
-
-                       public BlockManager () {
-                       }
-
-                       public int Position {
-                               get { return position; }
-                       }
-
-                       void EnsureCapacity (int capacity) {
-                               if (buffer.Length >= capacity)
-                                       return;
-
-                               capacity += PreferredLength;
-                               capacity = (capacity / PreferredLength) * PreferredLength;
-                               byte[] temp = new byte[capacity];
-                               Array.Copy(buffer, 0, temp, 0, buffer.Length);
-                               buffer = temp;
-                       }
-
-                       public void Write (byte [] buffer, int offset, int count) {
-                               if (count == 0)
-                                       return;
-
-                               EnsureCapacity (position + count);
-                               Array.Copy(buffer, offset, this.buffer, position, count);
-                               position += count;
-                       }
-
-                       public void Send (HttpWorkerRequest wr, int start, int end) {
-                               int length = end - start;
-                               if (length <= 0)
-                                       return;
-
-                               if (length > buffer.Length - start)
-                                       length = buffer.Length - start;
-
-                               if (start > 0) {
-                                       byte[] temp = new byte[length];
-                                       Array.Copy(buffer, start, temp, 0, length);
-                                       buffer = temp;
-                               }
-                               wr.SendResponseFromMemory(buffer, length);
-                       }
-
-                       public void Send (Stream stream, int start, int end) {
-                               int length = end - start;
-                               if (length <= 0)
-                                       return;
-
-                               if (length > buffer.Length - start)
-                                       length = buffer.Length - start;
-
-                               stream.Write(buffer, start, length);
-                       }
-
-                       public void Dispose () {
-                               buffer = null;
-                       }
-               }
-
-#else // TARGET_JVM
                unsafe sealed class BlockManager {
                        const int PreferredLength = 128 * 1024;
                        byte *data;
@@ -234,7 +165,6 @@ namespace System.Web
                        }
                }
 
-#endif
                abstract class Bucket {
                        public Bucket Next;
 
@@ -247,9 +177,7 @@ namespace System.Web
                        public abstract int Length { get; }
                }
 
-#if !TARGET_JVM
                unsafe
-#endif
                class ByteBucket : Bucket {
                        int start;
                        int length;
@@ -559,24 +487,12 @@ namespace System.Web
                        }
                }
 
-#if TARGET_JVM
-               void UnsafeWrite (HttpWorkerRequest wr, byte [] buffer, int offset, int count)
-               {
-                       if (count <= 0)
-                               return;
-
-                       byte[] copy = new byte[count];
-                       Array.Copy(buffer, offset, copy, 0, count);
-                       wr.SendResponseFromMemory (copy, count);
-               }
-#else
                unsafe void UnsafeWrite (HttpWorkerRequest wr, byte [] buffer, int offset, int count)
                {
                        fixed (byte *ptr = buffer) {
                                wr.SendResponseFromMemory ((IntPtr) (ptr + offset), count);
                        }
                }
-#endif
                void AppendBuffer (byte [] buffer, int offset, int count)
                {
                        if (!(cur_bucket is ByteBucket))
index 2f234ef4ed3504db57184081085b2e91a61d8e08..709c57dc088d9c7f735ce08767a37dc035d3c26c 100644 (file)
@@ -601,13 +601,6 @@ namespace System.Web
                }
 #endif
                
-#if TARGET_JVM
-               [MonoNotSupported ("UnloadAppDomain is not supported")]
-               public static void UnloadAppDomain ()
-               {
-                       throw new NotImplementedException ("UnloadAppDomain is not supported");
-               }
-#else
                //
                // Called when we are shutting down or we need to reload an application
                // that has been modified (touch global.asax) 
@@ -628,7 +621,6 @@ namespace System.Web
                                }
                        });
                }
-#endif
                //
                // Shuts down the AppDomain
                //
index 95980123ae4d09d5148ec6bc20012afd666cf10a..0c91350483c2124b46e1ffd823061c43946e3b86 100755 (executable)
@@ -317,7 +317,6 @@ namespace System.Web
                        // apparently does nothing in MS.NET
                }
 
-#if !TARGET_JVM
                public virtual void SendResponseFromMemory (IntPtr data, int length)
                {
                        if (data != IntPtr.Zero) {
@@ -326,7 +325,6 @@ namespace System.Web
                                SendResponseFromMemory (copy, length);
                        }
                }
-#endif
 
                public virtual void SetEndOfSendNotification (HttpWorkerRequest.EndOfSendNotification callback, object extraData)
                {
index b33e6707e9642a5930a2d5b4bd4e0a571f5e2d24..de5d13ab1bd64e7b23884f65942aa586486c21d1 100644 (file)
@@ -143,14 +143,10 @@ namespace System.Web
                {
                        if (buffer == null || index < 0 || count < 0 || (buffer.Length - index) < count)
                                throw new ArgumentOutOfRangeException ();
-#if TARGET_JVM
-                       output_stream.Write (buffer, index, count);
-#else
                        int length = encoding.GetMaxByteCount (count);
                        byte [] bytebuffer = GetByteBuffer (length);
                        int realLength = encoding.GetBytes (buffer, index, count, bytebuffer, 0);
                        output_stream.Write (bytebuffer, 0, realLength);
-#endif
                        if (response.buffer)
                                return;
 
@@ -171,14 +167,10 @@ namespace System.Web
 
                        if (index < 0 || count < 0 || ((index + count > s.Length)))
                                throw new ArgumentOutOfRangeException ();
-#if TARGET_JVM
-                       output_stream.Write (s, index, count);
-#else
                        int length = encoding.GetMaxByteCount (count);
                        byte [] bytebuffer = GetByteBuffer (length);
                        int realLength = encoding.GetBytes (s, index, count, bytebuffer, 0);
                        output_stream.Write (bytebuffer, 0, realLength);
-#endif
                        if (response.buffer)
                                return;
 
index 245ff6b2f8fbb1c3ae5d9d8a9abfec43fd1665c1..e64d6c21c70a8ba1f7bad1ff0fc2f8f75e45395c 100644 (file)
@@ -93,23 +93,8 @@ namespace System.Web
                        }
                }               
 
-#if TARGET_JVM
-               const string SiteMap_provider = "SiteMap_provider";
-               const string SiteMap_providers = "SiteMap_providers";
-               static SiteMapProvider provider
-               {
-                       get { return (SiteMapProvider) AppDomain.CurrentDomain.GetData (SiteMap_provider); }
-                       set { AppDomain.CurrentDomain.SetData (SiteMap_provider, value); }
-               }
-               static SiteMapProviderCollection providers
-               {
-                       get { return (SiteMapProviderCollection) AppDomain.CurrentDomain.GetData (SiteMap_providers); }
-                       set { AppDomain.CurrentDomain.SetData (SiteMap_providers, value); }
-               }
-#else
                static SiteMapProvider provider;
                static SiteMapProviderCollection providers;
-#endif
                static object locker = new object ();
        }
 }
index 12ffbce0e532e26f8f5ca7dae7f847358ab32f8c..84a92091ce61b5ff19824c40c7cfaefc8c2d7426 100644 (file)
@@ -41,16 +41,7 @@ namespace System.Web
        public class SiteMapNodeCollection : IList, IHierarchicalEnumerable
        {
                ArrayList list;
-#if TARGET_JVM
-               const string _siteMapNodeCollection_EmptyList = "SiteMapNodeCollection.EmptyList";
-               internal static SiteMapNodeCollection EmptyList
-               {
-                       get { return (SiteMapNodeCollection) AppDomain.CurrentDomain.GetData (_siteMapNodeCollection_EmptyList); }
-                       set { AppDomain.CurrentDomain.SetData (_siteMapNodeCollection_EmptyList, value); }
-               }
-#else
                internal static SiteMapNodeCollection EmptyList;
-#endif
                
                static SiteMapNodeCollection ()
                {
index 76b6e1087c05560e7f799c29bc26c5578300ad52..810f24c564439a5a3644839e418d5be541de8632 100644 (file)
@@ -86,24 +86,7 @@ namespace System.Web
                                if (strHeader != null) {
                                        DateTime dtIfModifiedSince = DateTime.ParseExact (strHeader, "r", null);
                                        DateTime ftime;
-#if TARGET_JVM
-                                       try 
-                                       {
-                                               ftime = fi.LastWriteTime.ToUniversalTime ();
-                                       } 
-                                       catch (NotSupportedException) 
-                                       {
-                                               // The file is in a WAR, it might be modified with last redeploy.
-                                               try {
-                                                       ftime = (DateTime) AppDomain.CurrentDomain.GetData (".appStartTime");
-                                               }
-                                               catch {
-                                                       ftime = DateTime.MaxValue;
-                                               }
-                                       }
-#else
                                        ftime = fi.LastWriteTime.ToUniversalTime ();
-#endif
                                        if (ftime <= dtIfModifiedSince) {
                                                response.ContentType = MimeTypes.GetMimeType (fileName);
                                                response.StatusCode = 304;
index 9d2f2f77413682790624aaabea41ca0ea5ddc3e7..9adcf765873a8bf366092e69fad5ea5e61f40ded 100644 (file)
@@ -88,9 +88,7 @@ namespace MonoTests.System.Web.Compilation {
                
                [Test]
                [NUnit.Framework.Category ("NunitWeb")]
-#if !TARGET_JVM
                [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ReadOnlyPropertyBindTest ()
                {
                        new WebTest ("ReadOnlyPropertyBind.aspx").Run ();
index d2b3a8f86367bbe87ced448abacbea7a8c5c03b2..b7f4d5138d96b57223dfe80d9f07d5723d6db145 100644 (file)
@@ -115,9 +115,6 @@ namespace MonoTests.System.Web.Hosting {
 
                [Test]
                [ExpectedException(typeof(SerializationException))]
-#if TARGET_JVM //System.Security.Policy.Evidence not implemented
-               [Category ("NotWorking")]
-#endif
                public void Constructor_PlainType ()
                {
                        ApplicationHost.CreateApplicationHost (typeof (ApplicationHostTest), "/app", Environment.CurrentDirectory);
index 9b9293fec9f67777d51c241df9ff60eb584c14ab..1e39670953600f5af951460ca6061dc046c696df 100644 (file)
@@ -55,7 +55,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        }
                }
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
                public void SetContext ()
                {            
                        SetContext (Context);
@@ -201,7 +201,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                }
 
 #if NET_2_0
-#if !TARGET_DOTNET && !TARGET_JVM
+#if !TARGET_DOTNET
                [Test]
                public void ActionStringWithQuery ()
                {
index 728dbe59540c95a116a4ec1ddeb12a24c53ba587..ff7953789982d7129945d6f026f476538b186afd 100644 (file)
@@ -144,9 +144,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
                [Category ("NunitWeb")]
-#if TARGET_JVM
-               [Ignore ("TD #7024")]
-#endif
                public void ActiveStepIndex () {
                        new WebTest (PageInvoker.CreateOnLoad (ActiveStepIndex_Load)).Run ();
                }
index b4018381128dda3aa4387e41412c7d811e05bedd..67cf6946ee345becef6dec162b2afb429330151c 100644 (file)
@@ -205,9 +205,6 @@ namespace MonoTests.System.Web.UI.WebControls
                
                [Test]
                [Category ("NunitWeb")]
-#if TARGET_JVM
-               [Ignore ("TD #6665")]
-#endif
                public void DataBoundControl_DataBindFlow2 () {
                        new WebTest (PageInvoker.CreateOnLoad (DataBoundControl_DataBindFlow2_Load)).Run ();
                }
index d1a26186f43fcc001526389f14658fb0eedf225e..416a8b9a1d1948a44af1452c03bff06ca838852b 100644 (file)
@@ -1567,9 +1567,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
 
                [Test]
                [Category ("NunitWeb")]
-//#if TARGET_JVM //BUG #6518
-//                [Category ("NotWorking")]
-//#endif
                public void FormView_RenderSimpleTemplate()
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1.aspx").Run ();
@@ -1585,9 +1582,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
 
                [Test]
                [Category ("NunitWeb")]
-//#if TARGET_JVM //BUG #6518
-//                [Category ("NotWorking")]
-//#endif
                public void FormView_RenderFooterAndPager()
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1_2.aspx").Run ();
@@ -1602,9 +1596,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
 
                [Test]
                [Category ("NunitWeb")]
-//#if TARGET_JVM //BUG #6518
-//                [Category ("NotWorking")]
-//#endif
                public void FormView_RenderWithHeader()
                {
                        string renderedPageHtml = new WebTest ("FormViewTest1_4.aspx").Run ();
@@ -1620,9 +1611,6 @@ CommandEventArgs cargs = new CommandEventArgs ("Page", "Prev");
 
                [Test]
                [Category ("NunitWeb")]
-//#if TARGET_JVM //BUG #6518
-//                [Category ("NotWorking")]
-//#endif
                public void FormView_Render ()
                {
                        string RenderedPageHtml = new WebTest ("FormViewTest1_3.aspx").Run ();
index eff56d1123fec5c4de6af70f86e446d21ba831cc..f79222deb05d54fbd30d156e629d539e72d4f5b0 100644 (file)
@@ -135,9 +135,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
                [Category("NunitWeb")]
-#if !TARGET_JVM
                [Category("NotWorking")]
-#endif
                public void SessionParameter_Evaluate()
                {
                        SessionParameterPoker sessionParam = new SessionParameterPoker("employee",TypeCode.String ,"id") ;
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceDerbyTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceDerbyTest.cs
deleted file mode 100644 (file)
index 2de9c7f..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-//
-// Tests for System.Web.UI.WebControls.SqlDataSource
-// This test uses Derby, java embedded database.
-//
-// Author:
-//     Vladimir Krasnov (vladimirk@mainsoft.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 NET_2_0 && TARGET_JVM
-
-using NUnit.Framework;
-using System;
-using System.Configuration;
-using System.Data;
-using System.Data.OleDb;
-using System.Data.Common;
-using System.IO;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Collections.Specialized;
-
-namespace MonoTests.System.Web.UI.WebControls
-{
-       [TestFixture]
-       public class SqlDataSourceDerbyTest {
-               [TestFixtureSetUp]
-               public void setup ()
-               {
-                       if (Directory.Exists (_dataDir))
-                               Directory.Delete (_dataDir, true);
-
-                       string initSql = @"CREATE TABLE Table1 (
-                               UserId                                  int                 NOT NULL PRIMARY KEY,
-                               UserName                                varchar(256)        NOT NULL,
-                               Description                             varchar(256)
-                       )";
-
-                       OleDbConnection connection = new OleDbConnection (_connectionString);
-                       try {
-                               connection.Open ();
-                               DbCommand cmd = connection.CreateCommand ();
-                               cmd.CommandText = initSql;
-                               cmd.CommandType = CommandType.Text;
-                               cmd.ExecuteNonQuery ();
-                       }
-                       catch (Exception) {
-                       }
-                       finally {
-                               connection.Close ();
-                       }
-               }
-
-               [Test]
-               public void SelectTest1 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1";
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-
-                       Assert.AreEqual (10, dataView.Count);
-               }
-
-               [Test]
-               public void SelectTest2 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1";
-                       ds.FilterExpression = "UserId > 5";
-
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (4, dataView.Count);
-               }
-
-               [Test]
-               public void SelectTest3 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1";
-
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ("Description"));
-                       Assert.AreEqual ("Description", dataView.Sort);
-               }
-
-               [Test]
-               public void SelectTest4 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1";
-                       try {
-                               DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments (1, 2));
-                       }
-                       catch (NotSupportedException) {
-                               Assert.AreEqual (true, true);
-                       }
-               }
-
-               [Test]
-               public void SelectTest5 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1 WHERE UserId = ?";
-                       ds.SelectParameters.Add (new Parameter ("UserId", TypeCode.Int32, "5"));
-
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (1, dataView.Count);
-               }
-
-               [Test]
-               public void UpdateTest1 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1 WHERE UserName = ?";
-                       ds.SelectParameters.Add (new Parameter ("UserName", TypeCode.String, "superuser"));
-
-                       ds.UpdateCommand = "UPDATE Table1 SET UserName = ? WHERE UserId = ?";
-                       ds.UpdateParameters.Add (new Parameter ("UserName", TypeCode.String, "superuser"));
-                       ds.UpdateParameters.Add (new Parameter ("UserId", TypeCode.Int32, "5"));
-
-                       int records = ds.Update ();
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (1, dataView.Count);
-                       Assert.AreEqual (1, records);
-
-               }
-
-               [Test]
-               public void UpdateTest2 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1 WHERE UserName = ?";
-                       ds.SelectParameters.Add (new Parameter ("UserName", TypeCode.String, "SimpleUser"));
-
-                       ds.UpdateCommand = "UPDATE Table1 SET UserName = ? WHERE UserId = ?";
-                       ds.UpdateParameters.Add (new Parameter ("UserName", TypeCode.String, "superuser"));
-                       ds.UpdateParameters.Add (new Parameter ("UserId", TypeCode.Int32, "5"));
-                       ds.OldValuesParameterFormatString = "original_{0}";
-
-                       SqlDataSourceView view = (SqlDataSourceView) ((IDataSource) ds).GetView ("");
-
-                       OrderedDictionary keys = new OrderedDictionary ();
-                       keys.Add ("UserId", 7);
-
-                       OrderedDictionary values = new OrderedDictionary ();
-                       values.Add ("UserName", "SimpleUser");
-
-                       OrderedDictionary oldvalues = new OrderedDictionary ();
-                       oldvalues.Add ("UserName", "user7");
-
-                       int records = view.Update (keys, values, oldvalues);
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (1, dataView.Count);
-                       Assert.AreEqual (1, records);
-
-               }
-
-               [Test]
-               public void InsertTest1 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1 WHERE UserName = ?";
-                       ds.SelectParameters.Add (new Parameter ("UserName", TypeCode.String, "newuser"));
-
-                       ds.InsertCommand = "INSERT INTO Table1 (UserId, UserName, Description) VALUES (?, ?, ?)";
-                       ds.InsertParameters.Add (new Parameter ("UserId", TypeCode.Int32, "15"));
-                       ds.InsertParameters.Add (new Parameter ("UserName", TypeCode.String, "newuser"));
-                       ds.InsertParameters.Add (new Parameter ("Description", TypeCode.String, "newuser"));
-
-                       int records = ds.Insert ();
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (1, dataView.Count);
-                       Assert.AreEqual (1, records);
-
-               }
-
-               [Test]
-               public void InsertTest2 ()
-               {
-                       SqlDataSource ds = CreateDataSource ();
-                       ds.SelectCommand = "SELECT * FROM Table1 WHERE UserName = ?";
-                       ds.SelectParameters.Add (new Parameter ("UserName", TypeCode.String, "newuser2"));
-
-                       ds.InsertCommand = "INSERT INTO Table1 (UserId, UserName, Description) VALUES (?, ?, ?)";
-                       ds.InsertParameters.Add (new Parameter ("UserId", TypeCode.Int32, "5"));
-                       ds.InsertParameters.Add (new Parameter ("UserName", TypeCode.String, "newuser"));
-                       ds.InsertParameters.Add (new Parameter ("Description", TypeCode.String, "newuser"));
-
-                       SqlDataSourceView view = (SqlDataSourceView) ((IDataSource) ds).GetView ("");
-
-                       OrderedDictionary values = new OrderedDictionary ();
-                       values.Add ("UserId", "17");
-                       values.Add ("UserName", "newuser2");
-                       values.Add ("Description", "newuser2");
-
-                       int records = view.Insert (values);
-                       DataView dataView = (DataView) ds.Select (new DataSourceSelectArguments ());
-                       Assert.AreEqual (1, dataView.Count);
-                       Assert.AreEqual (1, records);
-
-               }
-
-
-               const string _dataDir = "DataDir";
-               const string _connectionString = "JdbcDriverClassName=org.apache.derby.jdbc.EmbeddedDriver;JdbcURL=jdbc:derby:" + _dataDir + ";create=true";
-               private SqlDataSource CreateDataSource ()
-               {
-                       SqlDataSource ds = new SqlDataSource ();
-                       ds.ConnectionString = _connectionString;
-                       ds.ProviderName = "System.Data.OleDb";
-                       ds.DataSourceMode = SqlDataSourceMode.DataSet;
-                       return ds;
-               }
-
-               [SetUp]
-               public void RestoreData ()
-               {
-                       string insertSql = @"INSERT INTO Table1 VALUES ({0}, '{1}', '{2}')";
-                       string deleteSql = @"DELETE FROM Table1";
-
-                       OleDbConnection connection = new OleDbConnection (_connectionString);
-                       connection.Open ();
-                       try {
-                               DbCommand dc = connection.CreateCommand ();
-                               dc.CommandText = deleteSql;
-                               dc.CommandType = CommandType.Text;
-                               dc.ExecuteNonQuery ();
-
-                               for (int i = 0; i < 10; i++) {
-                                       DbCommand ic = connection.CreateCommand ();
-                                       ic.CommandText = string.Format (insertSql, i.ToString (), "user" + i.ToString (), (9 - i).ToString ());
-                                       ic.CommandType = CommandType.Text;
-                                       ic.ExecuteNonQuery ();
-                               }
-                       }
-                       catch (Exception) {
-                       }
-                       finally {
-                               connection.Close ();
-                       }
-               }
-       }
-
-}
-
-#endif
index 64eeca09aa7f3f73fe47ffcb6d04d5da48680205..bad00c9654481018162a54188b3661eb48670d5c 100644 (file)
@@ -38,9 +38,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.WebControls {
 
-#if TARGET_JVM
-    [vmw.common.ChangeInterfaceMethodNames]
-#endif
        public interface ITableRowTest {
 
                // testing
index 11dc1a62be608718e497da0ed4ab6613493ee4d9..3a9400f64b3b94e4b1b5e314c0676cf1edc3b370 100644 (file)
@@ -409,9 +409,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
                [Category ("NunitWeb")]
-#if TARGET_JVM
-               [Category ("NotWorking")] // File watcher is not supported
-#endif
                public void Save ()
                {
                        string origin = @"<div>
index ddf3812bfad62bf42a3a4c341c6e5e70bb1e5dc9..f08db8bc34d850d31be06ace1ff937840b56d876 100644 (file)
@@ -816,11 +816,7 @@ namespace MonoTests.System.Web.UI
 
                public static void ResolveUrl_Load (Page p)
                {
-#if TARGET_JVM
-                       string appPath = "/MainsoftWebApp20";
-#else
                        string appPath = "/NunitWeb";
-#endif
                        Control ctrl = new Control ();
                        p.Controls.Add (ctrl);
                        Assert.AreEqual (appPath + "/MyPage.aspx", ctrl.ResolveUrl ("~/MyPage.aspx"), "ResolveClientUrl Failed");
@@ -866,11 +862,7 @@ namespace MonoTests.System.Web.UI
 
                public static void ResolveUrl2_Load (Page p)
                {
-#if TARGET_JVM
-                       string appPath = "/MainsoftWebApp20";
-#else
                        string appPath = "/NunitWeb";
-#endif
                        Control uc = p.FindControl ("WebUserControl1");
                        Control ctrl = uc.FindControl ("Label");
 
index a09c17f6cd66ef2b3155523f572220f82c863bbc..59a23595bcd4cb276469dfcb5e169ce3cb030277 100644 (file)
@@ -784,9 +784,7 @@ namespace MonoTests.System.Web.UI {
 
                [Test]
                [Category ("NunitWeb")]
-#if !TARGET_JVM
                [Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
-#endif
                public void AddOnPreRenderCompleteAsync ()
                {
                        WebTest t = new WebTest ("AsyncPage.aspx");
@@ -801,9 +799,7 @@ namespace MonoTests.System.Web.UI {
                }
 
                [Test]
-#if !TARGET_JVM
                [Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
-#endif
                [Category ("NunitWeb")]
                public void ExecuteRegisteredAsyncTasks ()
                {
@@ -820,9 +816,7 @@ namespace MonoTests.System.Web.UI {
 
                [Test]
                [Category ("NunitWeb")]
-#if !TARGET_JVM
                [Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
-#endif
                [ExpectedException (typeof (Exception))]
                public void AddOnPreRenderCompleteAsyncBeginThrows () 
                {
@@ -833,9 +827,7 @@ namespace MonoTests.System.Web.UI {
 
                [Test]
                [Category ("NunitWeb")]
-#if !TARGET_JVM
                [Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
-#endif
                [ExpectedException (typeof (Exception))]
                public void AddOnPreRenderCompleteAsyncEndThrows () 
                {
index 2fc169593fa1444858bbe9b05a3cbed27a6672fe..0c7f0fa1962a6e5599b061f3d618d26be5eac827 100644 (file)
@@ -115,14 +115,6 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (true, t.DoSupportAutoEvents, "SupportAutoEvents");
                }
 
-#if TARGET_JVM
-               [Test]
-               public void TemplateControl_DefaultPropertyNotWorking ()
-               {
-                       PokerTemplateControl t = new PokerTemplateControl ();
-                       Assert.AreEqual (null, t.AppRelativeVirtualPath, "AppRelativeVirtualPath");
-               }
-#endif
 
                [Test]
                [Category ("NunitWeb")]
@@ -343,23 +335,6 @@ namespace MonoTests.System.Web.UI.WebControls
                }
 
 
-#if TARGET_JVM
-               [Test]
-               [ExpectedException(typeof(ArgumentNullException))]
-               public void TemplateControl_AppRelativeVirtualPathException1 ()
-               {
-                       PokerTemplateControl t = new PokerTemplateControl ();
-                       t.AppRelativeVirtualPath = null;
-               }
-
-               [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void TemplateControl_AppRelativeVirtualPathException2 ()
-               {
-                       PokerTemplateControl t = new PokerTemplateControl ();
-                       t.AppRelativeVirtualPath = "fake";
-               }
-#endif
                [TestFixtureTearDown]
                public void TearDown ()
                {
@@ -367,4 +342,4 @@ namespace MonoTests.System.Web.UI.WebControls
                }
        }
 }
-#endif
\ No newline at end of file
+#endif
index 839b260e7143751e80e222660fa68a74540c21e4..bb4c3c779a6d3445147e55f32a2c9b4a8d96db92 100644 (file)
@@ -263,9 +263,6 @@ namespace MonoTests.System.Web {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")] // char output stream in gh make this test fail
-#endif
                public void Test_Response ()
                {
                        FakeHttpWorkerRequest2 f;
@@ -287,9 +284,6 @@ namespace MonoTests.System.Web {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")] // char output stream in gh make this test fail
-#endif
                public void TestResponse_Chunked ()
                {
                        FakeHttpWorkerRequest2 f;
index a6a48011253f31c8a3501d7cc30f37e7512f5737..47bfa8e1ceef27e2d517c019ae29825ebaeb9ccd 100644 (file)
@@ -65,9 +65,6 @@ namespace MonoTests.System.Web {
 
                [Test]
                [Category ("NotDotNet")]
-#if TARGET_JVM
-               [Ignore ("TD #6954")]
-#endif
                public void HtmlEncode_XSS ()
                {
                        string problem = "\xff1cscript\xff1e";  // unicode looks alike <script>
index eccc9dbe634ec989d3e8165b51defcd52e606095..4c7228dd6a2b17e05f75e64870770f6663546150 100644 (file)
@@ -151,9 +151,6 @@ namespace MonoTests.System.Web {
 
                [Test]
                [Category ("NotDotNet")]
-#if TARGET_JVM
-               [Ignore ("TD #6954")]
-#endif
                public void HtmlEncode_XSS ()
                {
                        string problem = "\xff1cscript\xff1e";  // unicode looks alike <script>
@@ -306,9 +303,7 @@ namespace MonoTests.System.Web {
                }
 #endif
                [Test]
-#if !TARGET_JVM
                [Category ("NotWorking")]
-#endif
                public void HtmlEncode ()
                {
                        for (char c = char.MinValue; c < char.MaxValue; c++) {
@@ -608,9 +603,6 @@ namespace MonoTests.System.Web {
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD #6956")]
-#endif
                public void UrlEncodeUnicodeTest ()
                {
                        string str = "sch" + (char) 0xf6 + "n";
@@ -757,9 +749,6 @@ namespace MonoTests.System.Web {
 
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD #6956")]
-#endif
                public void ParseQueryString ()
                {
                        ParseQueryString_Helper (HttpUtility.ParseQueryString ("name=value"), "#1",
index 77a140646027ffa7cb903470f0cedc092fc4377a..ee9dda1ece1b0dff870c7bf038f935d36da1168c 100644 (file)
@@ -268,9 +268,6 @@ namespace MonoTests.System.Web {
 
                }
 
-#if TARGET_JVM //BUG #6499
-               [Category ("NotWorking")]
-#endif
                [Test] public void TestDefaults ()
                {
                        FakeHttpWorkerRequest f = new FakeHttpWorkerRequest ();
index afa944a705838c84966fe98aa20f2b579acfe84f..71e7580aa8b8cb22fcccfbacb9766c751824c123 100644 (file)
@@ -43,11 +43,7 @@ namespace MonoTests.System.Web {
        [TestFixture]
        public class VirtualPathUtilityTest {
 
-#if TARGET_JVM
-               const string NunitWebAppName = "MainsoftWebApp20";
-#else
                const string NunitWebAppName = "NunitWeb";
-#endif
 
                [Test]
                public void AppendTrailingSlash ()
index e2f207a1098e81469bc069504865db447e393bfe..8432eafdddbccd159bba4c3f28a06695972b5643 100644 (file)
@@ -62,7 +62,7 @@ using System.Runtime.CompilerServices;
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
-#if !(TARGET_JVM || TARGET_DOTNET)
+#if !(TARGET_DOTNET)
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 #endif
index 519935bdf43bca49072be5cbdc2db3ffaa7af379..53ed256edda2ce0087e45c90b0edc2b0cde3c61e 100644 (file)
@@ -7,7 +7,6 @@ using System.Xml.Serialization;
 using System.Xml.Xsl;
 using Microsoft.Win32;
 
-#if !TARGET_JVM
 namespace HtmlAgilityPack
 {
        /// <summary>
@@ -821,4 +820,3 @@ namespace HtmlAgilityPack
                }
        }
 }
-#endif
\ No newline at end of file
index e59b639382a5c883fcda3a5d119ef0be495e9f6d..092998110f84bdab1f1a9979ee4d785a19f5d31f 100644 (file)
@@ -23,58 +23,6 @@ namespace HtmlAgilityPack
                        File.Copy(source, target, true);
                }
     }
-#if TARGET_JVM1
-    internal struct HtmlLibrary
-       {
-               [Conditional("DEBUG")]
-               internal static void GetVersion(out string version)
-               {
-                       System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(1, true);
-                       version = sf.GetMethod().DeclaringType.Assembly.GetName().Version.ToString();
-               }
-
-               [Conditional("DEBUG")]
-               [Conditional("TRACE")]
-               internal static void Trace(object Value)
-               {
-                       // category is the method
-                       string name = null;
-                       GetCurrentMethodName(2, out name);
-                       System.Diagnostics.Trace.WriteLine(Value, name);
-               }
-
-               [Conditional("DEBUG")]
-               [Conditional("TRACE")]
-               internal static void TraceStackFrame(int steps)
-               {
-                       string name = null;
-                       GetCurrentMethodName(2, out name);
-                       string trace = "";
-                       for(int i=1;i<steps;i++)
-                       {
-                               System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(i, true);
-                               trace += sf.ToString();
-                       }
-                       System.Diagnostics.Trace.WriteLine(trace, name);
-                       System.Diagnostics.Trace.WriteLine("");
-               }
-
-               [Conditional("DEBUG")]
-               internal static void GetCurrentMethodName(out string name)
-               {
-                       name = null;
-                       GetCurrentMethodName(2, out name);
-               }
-
-               [Conditional("DEBUG")]
-               internal static void GetCurrentMethodName(int skipframe, out string name)
-               {
-                       StackFrame sf = new StackFrame(skipframe, true);
-                       name = sf.GetMethod().DeclaringType.Name + "." + sf.GetMethod().Name;
-               }
-
-    }
-#endif
     
     internal class HtmlCmdLine
        {
index bfd8e53031b892c9063d6e27943299172c7fa3b2..5980fbdd7d921ae4a1dfdaf260e631d03d924d9b 100644 (file)
@@ -81,11 +81,7 @@ namespace MonoTests.SystemWeb.Framework
                        headers.Add (INVOKER_HEADER, Serialize (t.Invoker));
                        headers.Add (USER_HEADER, Serialize (t.UserData));
                        WebRequest wr = t.Request.CreateWebRequest (
-#if TARGET_JVM
-                               new Uri ("http://localhost:8080/MainsoftWebApp20/"),
-#else
 new Uri ("http://localhost:59598/NunitWebTest/"),
-#endif
                                headers);
 
 
index 296b2b19304246f377aefae1b3ba02886e466b4e..6bbaa24ed0fa4c00e0568af68234840bf223eff7 100644 (file)
@@ -1,7 +1,3 @@
-#if TARGET_JVM
-#define BUG_78521_FIXED
-#endif
-
 using System;
 using System.Web.UI;
 
@@ -106,11 +102,8 @@ namespace MonoTests.SystemWeb.Framework
                        _page = (Page) parameters[0];
 
 #if NET_2_0
-#if BUG_78521_FIXED
-                       _page.PreInit += OnPreInit;
-#else
                        OnPreInit (null, null);
-#endif
+
                        _page.LoadComplete += OnLoadComplete;
                        _page.PreLoad += OnPreLoad;
                        _page.PreRenderComplete += OnPreRenderComplete;
index a8873618549e4609b267516040ee4101fa6bcc9a..750f40c752dd7c3486dc4509a632114e79320f0d 100644 (file)
@@ -1,7 +1,3 @@
-#if TARGET_JVM
-#define BUG_78521_FIXED
-#endif
-
 using System;
 using System.Web.UI;
 using MonoTests.SystemWeb.Framework;
@@ -9,11 +5,7 @@ using MonoTests.SystemWeb.Framework;
 public partial class MyPage : System.Web.UI.Page
 {
        //FIXME: mono defines its own constructor here
-#if BUG_78521_FIXED
-       public MyPage ()
-#else
        protected override void OnPreInit (EventArgs e)
-#endif
        {
                WebTest t = WebTest.CurrentTest;
                if (t != null)
index d7d386cdef2ddc4082d140cdea6a2fc2c64e6a56..f01d9f8795a058c9e4a27a5999b624d9548f7c7d 100644 (file)
@@ -1,7 +1,3 @@
-#if TARGET_JVM_FOR_WEBTEST
-#define TARGET_JVM
-#endif
-
 using System;
 using System.Reflection;
 using System.IO;
@@ -202,7 +198,6 @@ namespace MonoTests.SystemWeb.Framework
                /// </summary>
                public static void CleanApp ()
                {
-#if !TARGET_JVM
                        if (host != null) {
                                lock (_appUnloadedSync) {
                                        EventHandler handler = new EventHandler(PulseAppUnloadedSync);
@@ -218,7 +213,6 @@ namespace MonoTests.SystemWeb.Framework
                                baseDir = null;
                                binDir = null;
                        }
-#endif
                }
                
                private static object _appUnloadedSync = new object();
@@ -305,7 +299,6 @@ namespace MonoTests.SystemWeb.Framework
                {
                        if (type == null)
                                throw new ArgumentNullException ("type");
-#if !TARGET_JVM
                        using (Stream source = type.Assembly.GetManifestResourceStream (resourceName)) {
                                if (source == null)
                                        throw new ArgumentException ("resource not found: " + resourceName, "resourceName");
@@ -313,7 +306,6 @@ namespace MonoTests.SystemWeb.Framework
                                source.Read (array, 0, array.Length);
                                CopyBinary (array, targetUrl);
                        }
-#endif
                }
 
                public static void CopyPrefixedResources (Type type, string namePrefix, string targetDir)
@@ -347,9 +339,6 @@ namespace MonoTests.SystemWeb.Framework
                /// <example><code>CopyBinary (System.Text.Encoding.UTF8.GetBytes ("Hello"), "App_Data/Greeting.txt");</code></example>
                public static string CopyBinary (byte[] sourceArray, string targetUrl)
                {
-#if TARGET_JVM
-                       return null;
-#else
                        EnsureWorkingDirectories ();
                        EnsureDirectoryExists (Path.Combine (baseDir, Path.GetDirectoryName (targetUrl)));
                        string targetFile = Path.Combine (baseDir, targetUrl);
@@ -386,7 +375,6 @@ namespace MonoTests.SystemWeb.Framework
                        }
 
                        return targetFile;
-#endif
                }
 
                static WebTestResourcesSetupAttribute.SetupHandler CheckResourcesSetupHandler ()
@@ -408,14 +396,9 @@ namespace MonoTests.SystemWeb.Framework
                {
                        if (host != null)
                                return;
-#if TARGET_JVM
-                       host = new MyHost ();
-                       return;
-#else
                        host = AppDomain.CurrentDomain.GetData (HOST_INSTANCE_NAME) as MyHost;
                        if (host == null)
                                SetupHosting ();
-#endif
                }
                
                public static void SetupHosting ()
@@ -425,16 +408,10 @@ namespace MonoTests.SystemWeb.Framework
                
                public static void SetupHosting (WebTestResourcesSetupAttribute.SetupHandler resHandler)
                {
-#if !TARGET_JVM
                        if (host == null)
                                host = AppDomain.CurrentDomain.GetData (HOST_INSTANCE_NAME) as MyHost;
-#endif
                        if (host != null)
                                CleanApp ();
-#if TARGET_JVM
-                       host = new MyHost ();
-                       return;
-#else
                        if (resHandler == null)
                                resHandler = CheckResourcesSetupHandler ();
                        if (resHandler == null)
@@ -452,7 +429,6 @@ namespace MonoTests.SystemWeb.Framework
                        AppDomain.CurrentDomain.SetData (HOST_INSTANCE_NAME, host);
                        host.AppDomain.SetData (HOST_INSTANCE_NAME, host);
                        host.AppDomain.DomainUnload += new EventHandler (_unloadHandler.OnUnload);
-#endif
                }
 
                private static UnloadHandler _unloadHandler = new UnloadHandler();
@@ -485,7 +461,6 @@ namespace MonoTests.SystemWeb.Framework
                        
                        public void OnUnload (object o, EventArgs args)
                        {
-#if !TARGET_JVM
                 // Block new requests from starting
                                lock (_syncUnloading) {
                                        // Wait for pending requests to finish
@@ -501,7 +476,6 @@ namespace MonoTests.SystemWeb.Framework
                                        if (handler != null)
                                                handler(this, null);
                                }
-#endif
             }
                }
 
@@ -509,15 +483,10 @@ namespace MonoTests.SystemWeb.Framework
 
                public static string TestBaseDir {
                        get {
-#if !TARGET_JVM
                                return baseDir;
-#else
-                               return String.Empty;
-#endif
                        }
                }
                
-#if !TARGET_JVM
                const string VIRTUAL_BASE_DIR = "/NunitWeb";
                private static string baseDir;
                private static string binDir;
@@ -608,6 +577,5 @@ namespace MonoTests.SystemWeb.Framework
                }
 
                static partial void CopyResourcesLocal ();
-#endif
        }
 }
index 01bd1e8c073129799e5813023123d330c435d6e9..4f3d1edbb29bce5875919579d4f41173d52fc761 100644 (file)
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if !TARGET_JVM
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
 #if NET_2_1
@@ -61,7 +60,6 @@ using System.Runtime.InteropServices;
 #else
        [assembly: AssemblyKeyFile ("../ecma.pub")]
 #endif
-#endif
 
 #if NET_2_1
        [assembly: InternalsVisibleTo ("System.Runtime.Serialization, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
index 545ca1cb277005ee51816efdcd9d509eca66977a..5f6e12ff71f39d6bcacad900ba333f5728787636 100644 (file)
@@ -129,7 +129,7 @@ namespace Mono.Xml.Xsl {
                        
                        public object Compile (XPathNavigator node)
                        {
-#if TARGET_JVM || MOBILE
+#if MOBILE
                                throw new NotImplementedException ();
 #else
                                string suffix = "";
index d996c360e7e275fb75c496be5c50edabb6dd2074..45cf17a17ead2bd73f63b960dbcca157b6d65151 100644 (file)
@@ -31,9 +31,7 @@
 #if NET_2_0
 
 using System;
-#if !TARGET_JVM
 using System.Xml.Serialization.Advanced;
-#endif
 
 namespace System.Xml.Serialization 
 {
index 158f5f222caa69fdd8fc304c7fdd7594eae0d8c6..e22bb56d06afaeefa07c3d1c22bbfc913a1f7a13 100644 (file)
@@ -45,44 +45,13 @@ namespace System.Xml.Serialization
                static Hashtable primitiveArrayTypes;
                static Hashtable nullableTypes;
 
-#if TARGET_JVM
-               static readonly object AppDomain_TypeTranslatorCacheLock = new object ();
-               const string AppDomain_nameCacheName = "System.Xml.Serialization.TypeTranslator.nameCache";
-               const string AppDomain_nullableTypesName = "System.Xml.Serialization.TypeTranslator.nullableTypes";
-               
-               static Hashtable AppDomain_nameCache {
-                       get { return GetAppDomainCache (AppDomain_nameCacheName); }
-               }
-
-               static Hashtable AppDomain_nullableTypes {
-                       get { return GetAppDomainCache (AppDomain_nullableTypesName); }
-               }
-
-               static Hashtable GetAppDomainCache(string name) {
-                       Hashtable res = (Hashtable) AppDomain.CurrentDomain.GetData (name);
-
-                       if (res == null) {
-                               lock (AppDomain_TypeTranslatorCacheLock) {
-                                       res = (Hashtable) AppDomain.CurrentDomain.GetData (name);
-                                       if (res == null) {
-                                               res = Hashtable.Synchronized (new Hashtable ());
-                                               AppDomain.CurrentDomain.SetData (name, res);
-                                       }
-                               }
-                       }
-
-                       return res;
-               }
-#endif
 
                static TypeTranslator ()
                {
                        nameCache = new Hashtable ();
                        primitiveArrayTypes = Hashtable.Synchronized (new Hashtable ());
 
-#if !TARGET_JVM
                        nameCache = Hashtable.Synchronized (nameCache);
-#endif
                        // XSD Types with direct map to CLR types
 
                        nameCache.Add (typeof (bool), new TypeData (typeof (bool), "boolean", true));
@@ -211,18 +180,10 @@ namespace System.Xml.Serialization
                                TypeData pt = GetTypeData (type); // beware this recursive call btw ...
                                if (pt != null) {
                                                TypeData tt = (TypeData) nullableTypes [pt.XmlType];
-#if TARGET_JVM
-                                               if (tt == null)
-                                                       tt = (TypeData) AppDomain_nullableTypes [pt.XmlType];
-#endif
                                                if (tt == null) {
                                                        tt = new TypeData (type, pt.XmlType, false);
                                                        tt.IsNullable = true;
-#if TARGET_JVM
-                                                       AppDomain_nullableTypes [pt.XmlType] = tt;
-#else
                                                        nullableTypes [pt.XmlType] = tt;
-#endif
                                                }
                                                return tt;
                                }
@@ -232,11 +193,6 @@ namespace System.Xml.Serialization
                                TypeData typeData = nameCache[runtimeType] as TypeData;
                                if (typeData != null) return typeData;
 
-#if TARGET_JVM
-                               Hashtable dynamicCache = AppDomain_nameCache;
-                               typeData = dynamicCache[runtimeType] as TypeData;
-                               if (typeData != null) return typeData;
-#endif
 
                                string name;
                                if (type.IsArray) {
@@ -258,11 +214,7 @@ namespace System.Xml.Serialization
                                typeData = new TypeData (type, name, false);
                                if (nullableOverride)
                                        typeData.IsNullable = true;
-#if TARGET_JVM
-                               dynamicCache[runtimeType] = typeData;
-#else
                                nameCache[runtimeType] = typeData;
-#endif
                                return typeData;
                }
 
index e61c599490b2d116e300efb453b0d15bb90b42e4..b68d33eec94f2109a6cbad94f7e44d05ba41897a 100644 (file)
@@ -126,7 +126,7 @@ namespace System.Xml.Serialization
                {
                        get { return _mapMember.Name; }
                }
-#if !TARGET_JVM        && !NET_2_1
+#if !NET_2_1
                public string GenerateTypeName (System.CodeDom.Compiler.CodeDomProvider codeProvider)
                {
                        string ret = codeProvider.CreateValidIdentifier (_mapMember.TypeData.FullTypeName);
index 2ab13cdf37fd17468a64e642e33b7a710fc0fe8c..fe85269f2e82b8a07dca5994baa3563f588883ce 100644 (file)
@@ -709,16 +709,6 @@ namespace System.Xml.Serialization {
                        // Read all Fields via reflection.
                        ArrayList fieldList = new ArrayList();
                        FieldInfo[] tfields = type.GetFields (BindingFlags.Instance | BindingFlags.Public);
-#if TARGET_JVM
-                       // This statement ensures fields are ordered starting from the base type.
-                       for (int ti=0; ti<typeList.Count; ti++) {
-                               for (int i=0; i<tfields.Length; i++) {
-                                       FieldInfo field = tfields[i];
-                                       if (field.DeclaringType == typeList[ti])
-                                               fieldList.Add (field);
-                               }
-                       }
-#else
                        currentType = null;
                        int currentIndex = 0;
                        foreach (FieldInfo field in tfields)
@@ -731,22 +721,9 @@ namespace System.Xml.Serialization {
                                }
                                fieldList.Insert(currentIndex++, field);
                        }
-#endif
                        // Read all Properties via reflection.
                        ArrayList propList = new ArrayList();
                        PropertyInfo[] tprops = type.GetProperties (BindingFlags.Instance | BindingFlags.Public);
-#if TARGET_JVM
-                       // This statement ensures properties are ordered starting from the base type.
-                       for (int ti=0; ti<typeList.Count; ti++) {
-                               for (int i=0; i<tprops.Length; i++) {
-                                       PropertyInfo prop = tprops[i];
-                                       if (!prop.CanRead) continue;
-                                       if (prop.GetIndexParameters().Length > 0) continue;
-                                       if (prop.DeclaringType == typeList[ti])
-                                               propList.Add (prop);
-                               }
-                       }
-#else
                        currentType = null;
                        currentIndex = 0;
                        foreach (PropertyInfo prop in tprops)
@@ -761,7 +738,6 @@ namespace System.Xml.Serialization {
                                if (prop.GetIndexParameters().Length > 0) continue;
                                propList.Insert(currentIndex++, prop);
                        }
-#endif
                        var members = new List<XmlReflectionMember>();
                        int fieldIndex=0;
                        int propIndex=0;
index 0ea81302af1d48dce0db137b2d0eedd89862ad58..f907453399f550310848974fea0dbac09a9c7c41 100644 (file)
@@ -30,7 +30,7 @@
 //
 
 using System.Xml;
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
 using System.CodeDom.Compiler;
 #endif
 using System.Xml.Schema;
@@ -98,7 +98,7 @@ namespace System.Xml.Serialization
                        this.typeIdentifiers = typeIdentifiers;
                }
                
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                [MonoTODO]
                public XmlSchemaImporter (XmlSchemas schemas, CodeGenerationOptions options, CodeDomProvider codeProvider, ImportContext context)
                {
index 719d23e98b49905e5014bb4e667d42558d433df9..f0aef6257f24915e21ee48688dd060b83f11e7de 100644 (file)
@@ -37,7 +37,7 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
 using System.Text;
-#if !TARGET_JVM && !NET_2_1
+#if !NET_2_1
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
@@ -120,7 +120,7 @@ namespace System.Xml.Serialization
                        //       debugging pourposes by adding the "nofallback" option.
                        //       For example: MONO_XMLSERIALIZER_THS=0,nofallback
                        
-#if TARGET_JVM || NET_2_1
+#if NET_2_1
                        string db = null;
                        string th = null;
                        generationThreshold = -1;
@@ -521,7 +521,7 @@ namespace System.Xml.Serialization
                        throw new NotImplementedException ();
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                public static Assembly GenerateSerializer (Type[] types, XmlMapping[] mappings)
                {
                        return GenerateSerializer (types, mappings, null);
@@ -630,7 +630,7 @@ namespace System.Xml.Serialization
                        return new XmlSerializationReaderInterpreter (typeMapping);
                }
                
-#if TARGET_JVM || NET_2_1
+#if NET_2_1
                void CheckGeneratedTypes (XmlMapping typeMapping)
                {
                        throw new NotImplementedException();
index fd1c854ee3bbff67eae5cff10bc0525d0de8bb48..dbcb807c309650c62efd4eae20ad41562c17c111 100644 (file)
@@ -47,7 +47,7 @@ namespace System.Xml.Xsl
                bool enable_debug;
                object debugger;
                CompiledStylesheet s;
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
 //             TempFileCollection temporary_files;
 #endif
                XmlWriterSettings output_settings = new XmlWriterSettings ();
@@ -70,7 +70,7 @@ namespace System.Xml.Xsl
                        get { return output_settings; }
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                [MonoTODO]
                public TempFileCollection TemporaryFiles {
                        get { return null; /*temporary_files;*/ }
index bac049be278329041cd437465060087ed38a8e55..28e0013590e936192d7d5974378356b7ba715819 100644 (file)
@@ -838,7 +838,6 @@ namespace System.Xml {
                }
 
 #if NET_2_0 // actually NET_3_5
-#if !TARGET_JVM
 
                public static DateTimeOffset ToDateTimeOffset (string s)
                {
@@ -867,7 +866,6 @@ namespace System.Xml {
                {
                        return value.ToString (format, CultureInfo.InvariantCulture);
                }
-#endif
 
                // it is used only from 2.1 System.Xml.Serialization.dll from
                // MS Silverlight SDK. We don't use it so far.
index 457485172d3f57d1d09be2eb370af37a2591d33b..3efa2f3d991ff033330efeefa0c4a7646c8ee3f8 100644 (file)
@@ -466,12 +466,6 @@ namespace System.Xml
                                                }
                                        }
                                }
-#if TARGET_JVM
-                               else {
-                                       if (bufLength >= 10 && Encoding.Unicode.GetString (buffer, 2, 8) == "?xml")
-                                               enc = Encoding.Unicode;
-                               }
-#endif
                                bufPos = 0;
                                break;
                        default:
index a69c1045b76d41422c6d01e68d3ea06347ea102a..e05a22d7e91353f17f31437a23478e5c170b1a31 100644 (file)
@@ -23,9 +23,6 @@ namespace MonoTests.System.XmlSerialization
        {
                [Test]
                [NUnit.Framework.Category("NotDotNet")] // FDBK50639 
-#if TARGET_JVM
-               [Ignore ("JVM returns fields in different order")]
-#endif
                public void WriteLiteral ()
                {
                        Test data = BuildTestObject ();
index e9a161c6e3fd422f3153cc489f51483e564a02be..0405fe29a5a8092166e8c916617ca49ac821f6f4 100644 (file)
@@ -861,9 +861,6 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("JVM returns fields in different order")]
-#endif
                public void TestSerializeGroup ()
                {
                        Group myGroup = new Group ();
@@ -2196,7 +2193,7 @@ namespace MonoTests.System.XmlSerialization
                        ser.Deserialize (new XmlTextReader (xml, XmlNodeType.Document, null));
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                [Test]
                public void GenerateSerializerGenerics ()
                {
index a1b678c6186a7cc11c938caff3406721dc64c030..d82db8f554e728e7faf1565d72f6812f24ca9baa 100644 (file)
@@ -47,10 +47,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#4");
                        Assert.IsNull (xsltException.InnerException, "#5");
                        Assert.IsNull (xsltException.Source, "#6");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#7");
                        Assert.IsNull (xsltException.TargetSite, "#8");
-#endif
                }
 
                [Test]
@@ -65,10 +63,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#4");
                        Assert.IsNull (xsltException.InnerException, "#5");
                        Assert.IsNull (xsltException.Source, "#6");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#7");
                        Assert.IsNull (xsltException.TargetSite, "#8");
-#endif
                }
 #endif
 
@@ -85,10 +81,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#A4");
                        Assert.AreSame (cause, xsltException.InnerException, "#A5");
                        Assert.IsNull (xsltException.Source, "#A6");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#A7");
                        Assert.IsNull (xsltException.TargetSite, "#A8");
-#endif
                        xsltException = new XsltException ((string) null, cause);
                        Assert.AreEqual (0, xsltException.LineNumber, "#B1");
                        Assert.AreEqual (0, xsltException.LinePosition, "#B2");
@@ -97,10 +91,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#B5");
                        Assert.AreSame (cause, xsltException.InnerException, "#B6");
                        Assert.IsNull (xsltException.Source, "#B7");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#B8");
                        Assert.IsNull (xsltException.TargetSite, "#B9");
-#endif
                        xsltException = new XsltException (msg, (Exception) null);
                        Assert.AreEqual (0, xsltException.LineNumber, "#C1");
                        Assert.AreEqual (0, xsltException.LinePosition, "#C2");
@@ -108,10 +100,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#C4");
                        Assert.IsNull (xsltException.InnerException, "#C5");
                        Assert.IsNull (xsltException.Source, "#C6");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#C7");
                        Assert.IsNull (xsltException.TargetSite, "#C8");
-#endif
                        xsltException = new XsltException ((string) null, (Exception) null);
                        Assert.AreEqual (0, xsltException.LineNumber, "#D1");
                        Assert.AreEqual (0, xsltException.LinePosition, "#D2");
@@ -119,10 +109,8 @@ namespace MonoCasTests.System.Xml.Xsl {
                        Assert.IsNull (xsltException.SourceUri, "#D4");
                        Assert.IsNull (xsltException.InnerException, "#D5");
                        Assert.IsNull (xsltException.Source, "#D6");
-#if !TARGET_JVM
                        Assert.IsNull (xsltException.StackTrace, "#D7");
                        Assert.IsNull (xsltException.TargetSite, "#D8");
-#endif
                }
        }
 }
index 0761338aef3ce0f865af73d31135df098bb27a12..b1b6f6e45a04ca5515d2b1f746fd88382699ea53 100644 (file)
@@ -26,11 +26,7 @@ namespace MonoTests.oasis_xslt {
                        string exceptionsFilename = Path.Combine (EnvOptions.OutputDir, "res-exceptions.lst");
 
                        Helpers.ReadStrings (skipTargets, "ignore.lst");
-#if TARGET_JVM
-                       Helpers.ReadStrings (knownFailures, "knownFailures.jvm.lst");
-#else
                        Helpers.ReadStrings (knownFailures, "knownFailures.lst");
-#endif
                        Helpers.ReadStrings (fixmeList, "fixme.lst");
                        ArrayList exceptionsArray = new ArrayList();
                        Helpers.ReadStrings (exceptionsArray, exceptionsFilename);
index f5214b78446423852c81530d07766cd274e6cc2b..7fcdd61e63cd5590a050bdd76c2cd0cd0f7a9ada 100644 (file)
@@ -94,7 +94,6 @@ namespace System.Xml.Linq
                        return attribute.value == null ? (DateTime?) null : XUtil.ToDateTime (attribute.value);
                }
 
-#if !TARGET_JVM // Same as for System.Xml.XmlConvert.ToDateTimeOffset
 
                [CLSCompliant (false)]
                public static explicit operator DateTimeOffset (XAttribute attribute)
@@ -113,7 +112,6 @@ namespace System.Xml.Linq
                        return attribute.value == null ? (DateTimeOffset?) null : XmlConvert.ToDateTimeOffset (attribute.value);
                }
 
-#endif
 
                [CLSCompliant (false)]
                public static explicit operator decimal (XAttribute attribute)
index 9c39d12d1a92c4813ccc8b7dd636b89e1b1ebd4f..4fa7889633c5374110dea1d1c169b160ae0976d8 100644 (file)
@@ -135,7 +135,6 @@ namespace System.Xml.Linq
                        return element.Value == null ? (DateTime?) null : XUtil.ToDateTime (element.Value);
                }
 
-#if !TARGET_JVM // Same as for System.Xml.XmlConvert.ToDateTimeOffset
 
                [CLSCompliant (false)]
                public static explicit operator DateTimeOffset (XElement element)
@@ -154,7 +153,6 @@ namespace System.Xml.Linq
                        return element.Value == null ? (DateTimeOffset?) null : XmlConvert.ToDateTimeOffset (element.Value);
                }
 
-#endif
 
                [CLSCompliant (false)]
                public static explicit operator decimal (XElement element)
index 9b8a7ca4541442dfcd214d47a2df86a671f2deac..4b311e67e73572cf5cf8aac37d5a35877a81575d 100644 (file)
@@ -114,17 +114,8 @@ namespace System.Collections.Generic
                uint version;
 
 #if ONE_MEMBER_CACHE
-#if TARGET_JVM
-               static readonly LocalDataStoreSlot _cachedPathStore = System.Threading.Thread.AllocateDataSlot ();
-
-               static List<Node> cached_path {
-                       get { return (List<Node>) System.Threading.Thread.GetData (_cachedPathStore); }
-                       set { System.Threading.Thread.SetData (_cachedPathStore, value); }
-               }
-#else
                [ThreadStatic]
                static List<Node> cached_path;
-#endif
 
                static List<Node> alloc_path ()
                {
index 10951616484cde3a873715d2470166f5dbffe5a4..c5878914610f8472aa98c1b799c6a96c14903664 100644 (file)
@@ -100,18 +100,11 @@ namespace System.ComponentModel {
                        Dispose (false);
                }
 
-#if TARGET_JVM
-               public virtual void Dispose ()
-               {
-                       Dispose (true);
-               }
-#else
                public void Dispose ()
                {
                        Dispose (true);
                        GC.SuppressFinalize (this);
                }
-#endif
 
                // <summary>
                //   Controls disposal of resources used by this.
index 08c0a14832eb79cc68b236d2cd346ddb9ef39114..68630ac975e44a1a36629733c01039c25619eb14 100644 (file)
@@ -70,12 +70,10 @@ namespace System.ComponentModel
                        // Set fields to null
                }
 
-#if !TARGET_JVM
                ~MarshalByValueComponent ()
                {
                        Dispose (false);
                }
-#endif 
 
                public virtual object GetService (Type service) 
                {
index b7fa48ad0ad25890d1477647a8a160eed670adf0..e84115ff8bd86158cab8de5e269161661726afbd 100644 (file)
@@ -92,7 +92,6 @@ namespace System.ComponentModel
                        properties.Clear ();
                }
 
-#if !TARGET_JVM // DUAL_IFACE_CONFLICT
                void IList.Clear ()
                {
                        Clear ();
@@ -102,19 +101,12 @@ namespace System.ComponentModel
                {
                        Clear ();
                }
-#endif
 
                public bool Contains (PropertyDescriptor value)
                {
                        return properties.Contains (value);
                }
 
-#if TARGET_JVM // DUAL_IFACE_CONFLICT
-               public bool Contains (object value)
-               {
-                       return Contains ((PropertyDescriptor) value);
-               }
-#else
 
                bool IList.Contains (object value)
                {
@@ -125,7 +117,6 @@ namespace System.ComponentModel
                {
                        return Contains ((PropertyDescriptor) value);
                }
-#endif
 
                public void CopyTo (Array array, int index)
                {
@@ -198,12 +189,6 @@ namespace System.ComponentModel
                        properties.Remove (value);
                }
 
-#if TARGET_JVM// DUAL_IFACE_CONFLICT
-               public void Remove (object value)
-               {
-                       Remove ((PropertyDescriptor) value);
-               }
-#else
                void IDictionary.Remove (object value)
                {
                        Remove ((PropertyDescriptor) value);
@@ -213,7 +198,6 @@ namespace System.ComponentModel
                {
                        Remove ((PropertyDescriptor) value);
                }
-#endif
                public void RemoveAt (int index)
                {
                        if (readOnly) {
@@ -322,30 +306,22 @@ namespace System.ComponentModel
                        return new PropertyDescriptorCollection (descriptors, true);
                }
 
-#if TARGET_JVM //DUAL_IFACE_CONFLICT
-               public bool IsFixedSize
-#else
                bool IDictionary.IsFixedSize
                {
                        get {return ((IList)this).IsFixedSize;}
                }
                bool IList.IsFixedSize
-#endif
                {
                        get 
                        {
                                return readOnly;
                        }
                }
-#if TARGET_JVM //DUAL_IFACE_CONFLICT
-               public bool IsReadOnly
-#else
                bool IDictionary.IsReadOnly
                {
                        get {return ((IList)this).IsReadOnly;}
                }
                bool IList.IsReadOnly
-#endif
                {
                        get 
                        {
index 9ebeeddd36de23a063a04ab0e67a145d132ad6b0..df7f55bcecfaca781ccfb380b566f65f53b447fd 100644 (file)
@@ -600,12 +600,10 @@ public sealed class TypeDescriptor
                        editor = CreateEditor (editorType, componentType);
                        
                if (editorType == null || editor == null) {
-#if !TARGET_JVM
                        // Make sure the editorBaseType's static constructor has been called,
                        // since that's where we're putting the initialization of its editor table.
                        
                        System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (editorBaseType.TypeHandle);
-#endif                         
                        if (editors != null)
                                editor = FindEditorInTable (componentType, editorBaseType, editors [editorBaseType] as Hashtable);
                }
index 10f0fedaa876727b9da93546c9e8d9599efd1d11..9746541b7e0f938d3041583c918b9e1a23c9b8bc 100644 (file)
@@ -43,9 +43,6 @@ namespace System.ComponentModel
                private int native_error_code;
 
 //             [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
-#if TARGET_JVM
-               [MonoNotSupported("")]
-#endif
                public Win32Exception ()
                        : base (W32ErrorMessage (Marshal.GetLastWin32Error ()))
                {
@@ -66,18 +63,12 @@ namespace System.ComponentModel
                        native_error_code = error;
                }
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
-#if TARGET_JVM
-               [MonoNotSupported ("")]
-#endif
                public Win32Exception (string message)
                        : base (message)
                {
                        native_error_code = Marshal.GetLastWin32Error ();
                }
 
-#if TARGET_JVM
-               [MonoNotSupported ("")]
-#endif
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                public Win32Exception (string message, Exception innerException)
                        : base (message, innerException)
index 4fbff57411b09e2b90bb408ef2f0a02bff4b8b80..57aa6b19880683f76b923e984e4d92e4fc3d81eb 100644 (file)
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if CONFIGURATION_DEP && !TARGET_JVM
+#if CONFIGURATION_DEP
 extern alias PrebuiltSystem;
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
 #endif
index 940f45fe5a7582877499af5689892bfbd3e0c8ed..58ebcd7a5f73ee56af0dc156aee11fcd6c1df9f1 100644 (file)
@@ -20,7 +20,7 @@
 // Copyright (C) 2005, 2006 Novell, Inc (http://www.novell.com)
 //
 
-#if CONFIGURATION_DEP && !TARGET_JVM
+#if CONFIGURATION_DEP
 extern alias PrebuiltSystem;
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
 #endif
index 84995699644da2e6a0c772dce44603824e96d8ca..968532966e3d13de35882a06802f6fbbe507413c 100644 (file)
@@ -32,7 +32,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if CONFIGURATION_DEP && !TARGET_JVM
+#if CONFIGURATION_DEP
 extern alias PrebuiltSystem;
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
 #endif
@@ -47,32 +47,12 @@ using System.Security.Permissions;
 using System.Xml;
 using System.Xml.XPath;
 #endif
-#if TARGET_JVM
-using vmw.common;
-using vmw.@internal.io;
-#endif
 
 namespace System.Configuration
 {
        public sealed class ConfigurationSettings
        {
-#if !TARGET_JVM
                static IConfigurationSystem config = DefaultConfig.GetInstance ();
-#else
-               static IConfigurationSystem config {
-                       get {
-                               IConfigurationSystem conf = (IConfigurationSystem) AppDomain.CurrentDomain.GetData ("ConfigurationSettings.Config");
-                               if (conf == null) {
-                                       conf = DefaultConfig.GetInstance ();
-                                       AppDomain.CurrentDomain.SetData ("ConfigurationSettings.Config", conf);
-                               }
-                               return conf;
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData ("ConfigurationSettings.Config", value);
-                       }
-               }
-#endif
                static object lockobj = new object ();
                private ConfigurationSettings ()
                {
@@ -123,23 +103,7 @@ namespace System.Configuration
        //
        class DefaultConfig : IConfigurationSystem
        {
-#if !TARGET_JVM
                static readonly DefaultConfig instance = new DefaultConfig ();        
-#else
-               static DefaultConfig instance {
-                       get {
-                               DefaultConfig conf = (DefaultConfig) AppDomain.CurrentDomain.GetData ("DefaultConfig.instance");
-                               if (conf == null) {
-                                       conf = new DefaultConfig ();
-                                       AppDomain.CurrentDomain.SetData ("DefaultConfig.instance", conf);
-                               }
-                               return conf;
-                       }
-                       set {
-                               AppDomain.CurrentDomain.SetData ("DefaultConfig.instance", value);
-                       }
-               }
-#endif
                ConfigurationData config;
                
                private DefaultConfig ()
@@ -185,16 +149,6 @@ namespace System.Configuration
                                        config = data;
                        }
                }
-#if TARGET_JVM
-               internal static string GetBundledMachineConfig ()
-               {
-                       return null;
-               }
-               internal static string GetMachineConfigPath ()
-               {
-                       return System.Runtime.InteropServices.RuntimeEnvironment.SystemConfigurationFile;
-               }
-#else
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                extern private static string get_bundled_machine_config ();
                internal static string GetBundledMachineConfig ()
@@ -207,7 +161,6 @@ namespace System.Configuration
                {
                        return get_machine_config_path ();
                }
-#endif
                private static string GetAppConfigPath ()
                {
                        AppDomainSetup currentInfo = AppDomain.CurrentDomain.SetupInformation;
@@ -291,29 +244,14 @@ namespace System.Configuration
 #if (XML_DEP)
                        this.fileName = fileName;
                        if (fileName == null
-#if !TARGET_JVM
                                || !File.Exists (fileName)
-#endif
 )
                                return false;
                        
                        XmlTextReader reader = null;
 
                        try {
-#if !TARGET_JVM
                                FileStream fs = new FileStream (fileName, FileMode.Open, FileAccess.Read);
-#else
-                               Stream fs = (Stream) vmw.common.IOUtils.getStream (fileName);
-
-                               //patch for machine.config
-                               if (fs == null && fileName.EndsWith ("machine.config")) {
-                                       fs = (Stream) IOUtils.getStreamForGHConfigs (fileName);
-                               }
-
-                               if (fs == null) {
-                                       return false;
-                               }
-#endif
                                reader = new XmlTextReader (fs);
                                if (InitRead (reader))
                                        ReadConfigFile (reader);
index 34528367290d31e107997b313c6d1b7f521976f5..02f2087cc422e29df21c4a1999a5041318332727 100644 (file)
@@ -29,9 +29,7 @@
 
 #if CONFIGURATION_DEP
 
-#if !TARGET_JVM
 extern alias PrebuiltSystem;
-#endif
 
 using System;
 using System.Collections;
@@ -44,11 +42,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Xml;
 
-#if TARGET_JVM
-using NameValueCollection = System.Collections.Specialized.NameValueCollection;
-#else
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
-#endif
 
 namespace System.Configuration
 {
@@ -264,7 +258,6 @@ namespace System.Configuration
                                return attrs [0].Company;
                        }
 
-#if !TARGET_JVM
                        MethodInfo entryPoint = assembly.EntryPoint;
                        Type entryType = entryPoint != null ? entryPoint.DeclaringType : null;
                        if (entryType != null && !String.IsNullOrEmpty (entryType.Namespace)) {
@@ -272,9 +265,6 @@ namespace System.Configuration
                                return end < 0 ? entryType.Namespace : entryType.Namespace.Substring (0, end);
                        }
                        return "Program";
-#else
-                       return assembly.GetName ().Name;
-#endif
                }
 
                private static string GetProductName ()
@@ -283,20 +273,11 @@ namespace System.Configuration
                        if (assembly == null)
                                assembly = Assembly.GetCallingAssembly ();
 
-#if !TARGET_JVM
                        byte [] pkt = assembly.GetName ().GetPublicKeyToken ();
                        return String.Format ("{0}_{1}_{2}",
                                AppDomain.CurrentDomain.FriendlyName,
                                pkt != null && pkt.Length > 0 ? "StrongName" : "Url",
                                GetEvidenceHash());
-#else // AssemblyProductAttribute-based code
-                       AssemblyProductAttribute [] attrs = (AssemblyProductAttribute[]) assembly.GetCustomAttributes (typeof (AssemblyProductAttribute), true);
-               
-                       if ((attrs != null) && attrs.Length > 0) {
-                               return attrs [0].Product;
-                       }
-                       return assembly.GetName ().Name;
-#endif
                }
 
                // Note: Changed from base64() to hex output to avoid unexpected chars like '\' or '/' with filesystem meaning.
@@ -341,19 +322,15 @@ namespace System.Configuration
                                ProductVersion = GetProductVersion ().Split('.');
 
                        // C:\Documents and Settings\(user)\Application Data
-#if !TARGET_JVM
                        if (userRoamingBasePath == "")
                                userRoamingPath = Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData);
                        else
-#endif
                                userRoamingPath = userRoamingBasePath;
 
                        // C:\Documents and Settings\(user)\Local Settings\Application Data (on Windows)
-#if !TARGET_JVM
                        if (userLocalBasePath == "")
                                userLocalPath = Environment.GetFolderPath (Environment.SpecialFolder.LocalApplicationData);
                        else
-#endif
                                userLocalPath = userLocalBasePath;
 
                        if (isCompany) {
@@ -366,13 +343,11 @@ namespace System.Configuration
                                        Assembly assembly = Assembly.GetEntryAssembly ();
                                        if (assembly == null)
                                                assembly = Assembly.GetCallingAssembly ();
-#if !TARGET_JVM
                                        byte [] pkt = assembly.GetName ().GetPublicKeyToken ();
                                        ProductName = String.Format ("{0}_{1}_{2}",
                                                ProductName,
                                                pkt != null ? "StrongName" : "Url",
                                                GetEvidenceHash());
-#endif
                                }
                                userRoamingPath = Path.Combine (userRoamingPath, ProductName);
                                userLocalPath = Path.Combine (userLocalPath, ProductName);
index 14358d1f26275bed4e236bfaea58d33af5b89ccc..d0ca5ab0a48b838a95eb18378f4e3209b4f89859 100644 (file)
@@ -28,7 +28,7 @@
 //
 
 #if CONFIGURATION_DEP
-#if CONFIGURATION_DEP && !TARGET_JVM
+#if CONFIGURATION_DEP
 extern alias PrebuiltSystem;
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
 #endif
@@ -59,14 +59,7 @@ namespace System.Configuration
                public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context,
                                                                                   SettingsPropertyCollection properties)
                {
-#if TARGET_JVM
-                       SettingsPropertyValueCollection pv = new SettingsPropertyValueCollection ();
-                       foreach (SettingsProperty prop in properties)
-                               pv.Add (new SettingsPropertyValue (prop));
-                       return pv;
-#else
                        return impl.GetPropertyValues (context, properties);
-#endif
                }
 
 #if CONFIGURATION_DEP
index 8eda0fa240fe3755986a765e1f4461e8831cd2eb..9750c53b34a956a5813feffd9624b423be18434a 100644 (file)
@@ -64,14 +64,10 @@ namespace System.Diagnostics {
                        OnWin32 = (Path.DirectorySeparatorChar == '\\');
 
                        if (!OnWin32) {
-#if TARGET_JVM
-                               string trace = java.lang.System.getProperty("MONO_TRACE");
-#else
                                // If we're running on Unix, we don't have OutputDebugString.
                                // Instead, send output to...wherever the MONO_TRACE_LISTENER environment
                                // variables says to.
                                String trace = Environment.GetEnvironmentVariable("MONO_TRACE_LISTENER");
-#endif
 
 #if MOBILE
                                if (trace == null)
@@ -215,10 +211,6 @@ namespace System.Diagnostics {
                        Abort
                }
 
-#if TARGET_JVM
-               private void WriteDebugString (string message)
-               {
-#else
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static void WriteWindowsDebugString (string message);
 
@@ -227,7 +219,6 @@ namespace System.Diagnostics {
                        if (OnWin32)
                                WriteWindowsDebugString (message);
                        else
-#endif
                                WriteMonoTrace (message);
                }
 
index 49c2b04f6e11387b466e95641b5f3093afe9f1a4..149ad3bc5ba1deb5f6c81a9030586378d95d5975 100644 (file)
@@ -186,7 +186,6 @@ namespace System.Diagnostics
                // them
                private void AddSwitchesNode (IDictionary d, XmlNode node)
                {
-#if !TARGET_JVM
                        // There are no attributes on <switch/>
                        ValidateInvalidAttributes (node.Attributes, node);
 
@@ -224,7 +223,6 @@ namespace System.Diagnostics
                        }
 
                        d [node.Name] = newNodes;
-#endif
                }
 
                private static object GetSwitchValue (string name, string value)
@@ -367,7 +365,6 @@ namespace System.Diagnostics
                // for add, "name" is required; initializeData is optional; "type" is required in 1.x, optional in 2.0.
                private void AddTraceListeners (IDictionary d, XmlNode listenersNode, TraceListenerCollection listeners)
                {
-#if !TARGET_JVM
                        // There are no attributes on <listeners/>
                        ValidateInvalidAttributes (listenersNode.Attributes, listenersNode);
 
@@ -398,7 +395,6 @@ namespace System.Diagnostics
                                else
                                        ThrowUnrecognizedNode (child);
                        }
-#endif
                }
 
                private void AddTraceListener (IDictionary d, XmlNode child, XmlAttributeCollection attributes, TraceListenerCollection listeners)
index 7bb49150b5ef1210361f721d78c6cdcde1c029a8..f4dbc6e58ecc601841c23a8a2cf744e68afa6a4e 100644 (file)
@@ -43,55 +43,6 @@ namespace System.Diagnostics {
 
        public abstract class TraceListener : MarshalByRefObject, IDisposable {
 
-#if TARGET_JVM
-               readonly LocalDataStoreSlot _indentLevelStore = System.Threading.Thread.AllocateDataSlot ();
-               readonly LocalDataStoreSlot _indentSizeStore = System.Threading.Thread.AllocateDataSlot ();
-               readonly LocalDataStoreSlot _attributesStore = System.Threading.Thread.AllocateDataSlot ();
-               readonly LocalDataStoreSlot _filterStore = System.Threading.Thread.AllocateDataSlot ();
-               readonly LocalDataStoreSlot _optionsStore = System.Threading.Thread.AllocateDataSlot ();
-               
-               private int indentLevel {
-                       get {
-                               object o = System.Threading.Thread.GetData (_indentLevelStore);
-                               if (o == null)
-                                       return 0;
-                               return (int) o;
-                       }
-                       set { System.Threading.Thread.SetData (_indentLevelStore, value); }
-               }
-               
-               private int indentSize {
-                       get {
-                               object o = System.Threading.Thread.GetData (_indentSizeStore);
-                               if (o == null)
-                                       return 4;
-                               return (int) o;
-                       }
-                       set { System.Threading.Thread.SetData (_indentSizeStore, value); }
-               }
-
-               private StringDictionary attributes {
-                       get { return (StringDictionary) System.Threading.Thread.GetData (_attributesStore); }
-                       set { System.Threading.Thread.SetData (_attributesStore, value); }
-               }
-
-#if !MOBILE
-               private TraceFilter filter {
-                       get { return (TraceFilter) System.Threading.Thread.GetData (_filterStore); }
-                       set { System.Threading.Thread.SetData (_filterStore, value); }
-               }
-#endif
-
-               private TraceOptions options {
-                       get {
-                               object o = System.Threading.Thread.GetData (_optionsStore);
-                               if (o == null)
-                                       return TraceOptions.None;
-                               return (TraceOptions) o;
-                       }
-                       set { System.Threading.Thread.SetData (_optionsStore, value); }
-               }
-#else
                [ThreadStatic]
                private int indentLevel = 0;
 
@@ -106,7 +57,6 @@ namespace System.Diagnostics {
 #endif
                [ThreadStatic]
                private TraceOptions options;
-#endif
 
                private string name;
                private bool needIndent = true;
index 6d09133698987197b95b02b3b6268f24a5fadc84..08a9a655b2ecd2bff713cadf85c1a8cf2f454250 100644 (file)
@@ -572,12 +572,10 @@ namespace System.IO.Ports
                        if (is_open)
                                throw new InvalidOperationException ("Port is already open");
                        
-#if !TARGET_JVM
                        if (IsWindows) // Use windows kernel32 backend
                                stream = new WinSerialStream (port_name, baud_rate, data_bits, parity, stop_bits, dtr_enable,
                                        rts_enable, handshake, read_timeout, write_timeout, readBufferSize, writeBufferSize);
                        else // Use standard unix backend
-#endif
                                stream = new SerialPortStream (port_name, baud_rate, data_bits, parity, stop_bits, dtr_enable,
                                        rts_enable, handshake, read_timeout, write_timeout, readBufferSize, writeBufferSize);
                        
index fc0d45dbd20adb9314b7128203680ccf64373f88..3470f2a8768b0579758e9f7d07136fd9bfcbe216 100644 (file)
@@ -238,7 +238,6 @@ namespace System.IO.Ports
                        throw new NotSupportedException();
                }
 
-#if !TARGET_JVM
                [DllImport("kernel32", SetLastError = true)]
                        static extern unsafe bool ReadFile (int handle, byte* buffer, int bytes_to_read,
                                        out int bytes_read, IntPtr overlapped);
@@ -246,7 +245,6 @@ namespace System.IO.Ports
                [DllImport("kernel32", SetLastError = true)]
                        static extern unsafe bool GetOverlappedResult (int handle, IntPtr overlapped,
                                        ref int bytes_transfered, bool wait);
-#endif
 
                public override int Read ([In, Out] byte [] buffer, int offset, int count)
                {
@@ -283,11 +281,9 @@ namespace System.IO.Ports
                        return bytes_read;
                }
 
-#if !TARGET_JVM
                [DllImport("kernel32", SetLastError = true)]
                static extern unsafe bool WriteFile (int handle, byte* buffer, int bytes_to_write,
                                out int bytes_written, IntPtr overlapped);
-#endif
 
                public override void Write (byte [] buffer, int offset, int count)
                {
index 4188a96c3219b620c513237872baf041d2755ea0..81a5a04d1b650259b07eee235e198d0c1c9f53ad 100644 (file)
@@ -661,16 +661,8 @@ namespace System.Net.Mail {
                                        sfre.Add (new SmtpFailedRecipientException (status.StatusCode, message.Bcc [i].Address));
                        }
 
-#if TARGET_JVM // List<T>.ToArray () is not supported
-                       if (sfre.Count > 0) {
-                               SmtpFailedRecipientException[] xs = new SmtpFailedRecipientException[sfre.Count];
-                               sfre.CopyTo (xs);
-                               throw new SmtpFailedRecipientsException ("failed recipients", xs);
-                       }
-#else
                        if (sfre.Count >0)
                                throw new SmtpFailedRecipientsException ("failed recipients", sfre.ToArray ());
-#endif
 
                        // DATA
                        status = SendCommand ("DATA");
@@ -978,11 +970,7 @@ try {
                                case TransferEncoding.Base64:
                                        byte [] content = new byte [av.ContentStream.Length];
                                        av.ContentStream.Read (content, 0, content.Length);
-#if TARGET_JVM
-                                       SendData (Convert.ToBase64String (content));
-#else
                                            SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
-#endif
                                        break;
                                case TransferEncoding.QuotedPrintable:
                                        byte [] bytes = new byte [av.ContentStream.Length];
@@ -1022,11 +1010,7 @@ try {
                                case TransferEncoding.Base64:
                                        byte [] content = new byte [lr.ContentStream.Length];
                                        lr.ContentStream.Read (content, 0, content.Length);
-#if TARGET_JVM
-                                       SendData (Convert.ToBase64String (content));
-#else
                                            SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
-#endif
                                        break;
                                case TransferEncoding.QuotedPrintable:
                                        byte [] bytes = new byte [lr.ContentStream.Length];
@@ -1058,11 +1042,7 @@ try {
                                att.ContentStream.Read (content, 0, content.Length);
                                switch (att.TransferEncoding) {
                                case TransferEncoding.Base64:
-#if TARGET_JVM
-                                       SendData (Convert.ToBase64String (content));
-#else
                                        SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
-#endif
                                        break;
                                case TransferEncoding.QuotedPrintable:
                                        SendData (ToQuotedPrintable (content));
@@ -1198,9 +1178,7 @@ try {
                                throw new SmtpException (SmtpStatusCode.GeneralFailure, "Server does not support secure connections.");
                        }
 
-#if TARGET_JVM
-                       ((NetworkStream) stream).ChangeToSSLSocket ();
-#elif SECURITY_DEP
+#if   SECURITY_DEP
                        SslStream sslStream = new SslStream (stream, false, callback, null);
                        CheckCancellation ();
                        sslStream.AuthenticateAsClient (Host, this.ClientCertificates, SslProtocols.Default, false);
index 4c76fd9bb9d4663dc5d65b81f1f57c9fa69fcba3..ceda2dd7b9caa132f07aaf9b3bf42742366c10b1 100644 (file)
@@ -98,12 +98,10 @@ namespace System.Net.Mail {
                        base.GetObjectData (info, context);
                        info.AddValue ("Status", statusCode, typeof (int));
                }
-#if !TARGET_JVM //remove private implementation
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
                {
                        GetObjectData (info, context);
                }
-#endif
        }
 }
 
index 5d8c462364bebddca262b27270440745d8f4b290..c4dbe9c03416f9904074d69539bdbdb77c6e4b8c 100644 (file)
@@ -98,12 +98,10 @@ namespace System.Net.Mail {
                        base.GetObjectData (serializationInfo, streamingContext);
                        serializationInfo.AddValue ("failedRecipient", failedRecipient);
                }
-#if !TARGET_JVM //remove private implementation
                void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
                {
                        GetObjectData (serializationInfo, streamingContext);
                }
-#endif
 
                #endregion // Methods
        }
index dcfab22b6d49720b0f77441b5c3695f1c9f293c3..6f2e3af8e50d808092b2836f09c10893d703c199 100644 (file)
@@ -88,12 +88,10 @@ namespace System.Net.Mail {
                        info.AddValue ("innerExceptions", innerExceptions);
                }
 
-#if !TARGET_JVM //remove private implementation
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
                {
                        GetObjectData (info, context);
                }
-#endif
 
                #endregion // Methods
        }
index a9500a435e93b28501e61a53f9095962271f36f8..27f3c54aec8189e4d5bc0a1facce25aa033cef2b 100644 (file)
@@ -143,9 +143,6 @@ namespace System.Net.Sockets
                }
 
 #if !NET_2_1 || MOBILE
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported since Socket.ReceiveTimeout is not supported")]
-#endif
                public override int ReadTimeout
                {
                        get {
@@ -179,9 +176,6 @@ namespace System.Net.Sockets
                }
 
 #if !NET_2_1 || MOBILE
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported since Socket.SendTimeout is not supported")]
-#endif
                public override int WriteTimeout
                {
                        get {
@@ -431,12 +425,6 @@ namespace System.Net.Sockets
                                throw new ObjectDisposedException (GetType().FullName);
                }
 
-#if TARGET_JVM
-               public void ChangeToSSLSocket()
-               {
-                       socket.ChangeToSSL();
-               }
-#endif
 
        }
 }
index a453d70e43fa9043f3e0ffd85690e57974f9b99e..cecabd1e18aa111cba12ffdab425d75263071dd7 100644 (file)
@@ -68,12 +68,10 @@ namespace System.Net.Sockets
 
                        sockets.Add (null);
                }
-#if !TARGET_JVM
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static void Select_internal (ref Socket [] sockets,
                                                        int microSeconds,
                                                        out int error);
-#endif
                public static void Select (IList checkRead, IList checkWrite, IList checkError, int microSeconds)
                {
                        var list = new List<Socket> ();
@@ -200,11 +198,9 @@ namespace System.Net.Sockets
                }
 #endif
        
-#if !TARGET_JVM
                // Returns the amount of data waiting to be read on socket
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static int Available_internal(IntPtr socket, out int error);
-#endif
 
                public int Available {
                        get {
@@ -404,11 +400,9 @@ namespace System.Net.Sockets
                        }
                }
 
-#if !TARGET_JVM
                // Returns the local endpoint details in addr and port
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static SocketAddress LocalEndPoint_internal(IntPtr socket, int family, out int error);
-#endif
 
                // Wish:  support non-IP endpoints.
                public EndPoint LocalEndPoint {
index 895c765e121698d75edaf24bf3ccb91ee8ae8262..d5b217bfdf583c15d4bd30e1176c717c3efd889a 100644 (file)
@@ -37,15 +37,10 @@ namespace System.Net.Sockets
        [Serializable]
        public class SocketException : Win32Exception
        {
-#if TARGET_JVM
-               public SocketException ()
-                       : base (-2147467259)
-#else
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private static extern int WSAGetLastError_internal ();
                public SocketException ()
                        : base (WSAGetLastError_internal ())
-#endif
                {
                }
 
index 7616b88c788087763599527518712eaf4a1c3ae0..b0295bef71beff144c4de459318150487d150b83 100644 (file)
@@ -901,14 +901,12 @@ namespace System.Net.Sockets {
                        }
                }
 
-#if !TARGET_JVM
                // Creates a new system socket, returning the handle
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern IntPtr Socket_internal(AddressFamily family,
                                                      SocketType type,
                                                      ProtocolType proto,
                                                      out int error);
-#endif         
                
                public Socket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
                {
@@ -964,12 +962,10 @@ namespace System.Net.Sockets {
                        get { return address_family; }
                }
 
-#if !TARGET_JVM
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static void Blocking_internal(IntPtr socket,
                                                             bool block,
                                                             out int error);
-#endif
 
                public bool Blocking {
                        get {
index f1842706fcc1409aed23bdfd96ee681715d1f4a9..a66e55abadf51a612616efe3ca4805918a59f20e 100644 (file)
@@ -130,9 +130,6 @@ namespace System.Net.Sockets
                        get { return client.Connected; }
                }
 
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
-#endif
                public bool ExclusiveAddressUse {
                        get {
                                return(client.ExclusiveAddressUse);
@@ -372,25 +369,16 @@ namespace System.Net.Sockets
                        client.EndConnect (asyncResult);
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
-#endif
                public IAsyncResult BeginConnect (IPAddress address, int port, AsyncCallback requestCallback, object state)
                {
                        return client.BeginConnect (address, port, requestCallback, state);
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
-#endif
                public IAsyncResult BeginConnect (IPAddress[] addresses, int port, AsyncCallback requestCallback, object state)
                {
                        return client.BeginConnect (addresses, port, requestCallback, state);
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
-#endif
                public IAsyncResult BeginConnect (string host, int port, AsyncCallback requestCallback, object state)
                {
                        return client.BeginConnect (host, port, requestCallback, state);
index 8047d9b38a3c4072d3d2e2669d0bdc01bc615702..d9322f52e6796c6499c967889d44febd1db4171f 100644 (file)
@@ -148,9 +148,6 @@ namespace System.Net.Sockets
                /// Specifies whether the TcpListener allows only one
                /// underlying socket to listen to a specific port
                /// </summary>
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
-#endif
                public bool ExclusiveAddressUse
                {
                        get {
index 1840a8e7bbcd83f4e522cde80824595873e16da8..a8bc06de5a829509fe42caa6b0ecd4252c502f5d 100644 (file)
@@ -520,9 +520,6 @@ namespace System.Net.Sockets
                        }
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.DontFragment is not supported")]
-#endif
                public bool DontFragment
                {
                        get {
@@ -533,9 +530,6 @@ namespace System.Net.Sockets
                        }
                }
 
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.EnableBroadcast is not supported")]
-#endif
                public bool EnableBroadcast
                {
                        get {
@@ -546,9 +540,6 @@ namespace System.Net.Sockets
                        }
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
-#endif
                public bool ExclusiveAddressUse
                {
                        get {
@@ -559,9 +550,6 @@ namespace System.Net.Sockets
                        }
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.MulticastLoopback is not supported")]
-#endif
                public bool MulticastLoopback
                {
                        get {
@@ -572,9 +560,6 @@ namespace System.Net.Sockets
                        }
                }
                
-#if TARGET_JVM
-               [MonoNotSupported ("Not supported as Socket.Ttl is not supported")]
-#endif
                public short Ttl
                {
                        get {
index 75251e415d314db9de7366db7a1815027754d7ba..1c1209cfda14e7b0f0ee90861f29d8ed26c35719 100644 (file)
@@ -53,13 +53,11 @@ namespace System.Net
                {                       \r
                }\r
 \r
-#if !TARGET_JVM\r
                // Methods\r
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)\r
                {\r
                        base.GetObjectData (info, context);\r
                }\r
-#endif\r
 \r
                public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
                {\r
index fb532cd22c2a8a19929b6cfe1b85a20f08d00f7d..81da4fa208494fdd2fe392ae6a6a6f70f6f4eaf7 100644 (file)
@@ -282,7 +282,6 @@ namespace System.Net {
                }
 
 
-#if !TARGET_JVM
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static bool GetHostByName_internal(string host, out string h_name, out string[] h_aliases, out string[] h_addr_list);
 
@@ -291,7 +290,6 @@ namespace System.Net {
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static bool GetHostName_internal(out string h_name);
-#endif 
 
                static void Error_11001 (string hostName)
                {
@@ -362,29 +360,9 @@ namespace System.Net {
 
                        string h_name;
                        string[] h_aliases, h_addrlist;
-#if TARGET_JVM
-                       h_name = null;
-                       h_aliases = null;
-                       h_addrlist = null;
-                       try {
-                               java.net.InetAddress[] iaArr = 
-                                       java.net.InetAddress.getAllByName(address);
-                               if (iaArr != null && iaArr.Length > 0)
-                                   h_name = iaArr[0].getHostName();
-                               if (iaArr != null && iaArr.Length > 0)
-                               {
-                                   h_addrlist = new String[iaArr.Length];
-                                   for (int i = 0; i < h_addrlist.Length; i++)
-                                       h_addrlist[i] = iaArr[i].getHostAddress();
-                               }
-                       } catch (java.net.UnknownHostException jUHE) {
-                               throw new SocketException((int)SocketError.HostNotFound, jUHE.Message);
-                       }
-#else
                        bool ret = GetHostByAddr_internal(address, out h_name, out h_aliases, out h_addrlist);
                        if (!ret)
                                Error_11001 (address);
-#endif
                        return (hostent_to_IPHostEntry (address, h_name, h_aliases, h_addrlist));
                        
                }
@@ -437,26 +415,6 @@ namespace System.Net {
                {
                        if (hostName == null)
                                throw new ArgumentNullException ("hostName");
-#if TARGET_JVM
-                       if (hostName.Length == 0)
-                               hostName = "localhost";
-                       try {
-                               java.net.InetAddress[] iaArr = java.net.InetAddress.getAllByName(hostName);
-                               IPHostEntry host = new IPHostEntry();
-                               if (iaArr != null && iaArr.Length > 0)
-                               {
-                                       host.HostName = iaArr[0].getHostName();
-                                       IPAddress[] ipArr = new IPAddress[iaArr.Length];
-                                       for (int i = 0; i < iaArr.Length; i++)
-                                               ipArr[i] = IPAddress.Parse(iaArr[i].getHostAddress());
-
-                                       host.AddressList = ipArr;
-                               }
-                               return host;
-                       } catch (java.net.UnknownHostException jUHE) {
-                               throw new SocketException((int)SocketError.HostNotFound, jUHE.Message);
-                       }
-#else
                        string h_name;
                        string[] h_aliases, h_addrlist;
 
@@ -465,14 +423,10 @@ namespace System.Net {
                                Error_11001 (hostName);
 
                        return(hostent_to_IPHostEntry(hostName, h_name, h_aliases, h_addrlist));
-#endif
                }
 
                public static string GetHostName ()
                {
-#if TARGET_JVM
-                       return java.net.InetAddress.getLocalHost ().getHostName ();
-#else
                        string hostName;
 
                        bool ret = GetHostName_internal(out hostName);
@@ -481,7 +435,6 @@ namespace System.Net {
                                Error_11001 (hostName);
 
                        return hostName;
-#endif
                }
 
                [Obsolete ("Use GetHostEntry instead")]
index 73a18f35863647584c5a375cafa042a79cb274ff..79f878cf591627aec2e61d0487d3e6c48b8d8030 100644 (file)
@@ -145,11 +145,7 @@ namespace System.Net
                        ((IDisposable) this).Dispose ();\r
                }\r
 \r
-#if TARGET_JVM //enable overrides for extenders\r
-               public override void Dispose()\r
-#else\r
                void IDisposable.Dispose()\r
-#endif\r
                {\r
                        Dispose (true);\r
                        \r
index 3354b2a8097d8b3117974c127b8b7bfab707e983..76fec164546a30bff8fd9baf67a00c5addf90c89 100644 (file)
@@ -1165,10 +1165,7 @@ namespace System.Net
 #endif
 
                internal bool ChangeToSSLSocket (ref Stream stream) {
-#if TARGET_JVM
-                       stream.ChangeToSSLSocket ();
-                       return true;
-#elif SECURITY_DEP
+#if   SECURITY_DEP
                        SslStream sslStream = new SslStream (stream, true, callback, null);
                        //sslStream.AuthenticateAsClient (Host, this.ClientCertificates, SslProtocols.Default, false);
                        //TODO: client certificates
index 957661f1e5a65a4209a9d9dafa15421abdd4bdd5..57992d18f8211fa29159c4d0395a6b4e145031cb 100644 (file)
@@ -1315,11 +1315,7 @@ namespace System.Net {
                                        // MS starts encoding with &# from 160 and stops at 255.
                                        // We don't do that. One reason is the 65308/65310 unicode
                                        // characters that look like '<' and '>'.
-#if TARGET_JVM
-                                       if (c > 159 && c < 256) {
-#else
                                        if (c > 159) {
-#endif
                                                output.Append ("&#");
                                                if (char.IsSurrogate (c))
                                                        output.Append (char.ConvertToUtf32 (s, i++));
index b005f06112386b258fb49d7d2f02ff20f13f1d90..0587dfe5333baff63e4f2bdcef488d273143abeb 100644 (file)
@@ -50,12 +50,10 @@ namespace System.Net
                }\r
 \r
                // Methods\r
-#if !TARGET_JVM\r
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)\r
                {\r
                        base.GetObjectData (info, context);\r
                }\r
-#endif\r
 \r
                public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
                {\r
index 1d72e569fdb75a85ae158aa851e2317bb6f3955f..e7d0f70be874332d693f903f50f91ea23800206e 100644 (file)
@@ -381,7 +381,6 @@ namespace System.Net
                        protocolVersion = version;
                }
 
-#if !TARGET_JVM
                internal EventHandler SendRequest (HttpWebRequest request, string groupName)
                {
                        WebConnection cnc;
@@ -399,7 +398,6 @@ namespace System.Net
                        
                        return cnc.SendRequest (request);
                }
-#endif
                public bool CloseConnectionGroup (string connectionGroupName)
                {
                        lock (this) {
index 66cdc7296feca5dbcbccaa586ad7deceeaf7d01f..b6095b089045edf6cf02322bf6f38f380d268cca 100644 (file)
@@ -137,11 +137,7 @@ namespace System.Net
                private static bool _checkCRL = false;
                private static SecurityProtocolType _securityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
 
-#if TARGET_JVM
-               static bool expectContinue = false;
-#else
                static bool expectContinue = true;
-#endif
                static bool useNagle;
                static RemoteCertificateValidationCallback server_cert_cb;
                static bool tcp_keepalive;
index 0f35c49b3e4f35978e5f90a1a25de789657e056f..d54c0cab147987855ac99612381a977419da400a 100644 (file)
@@ -490,11 +490,7 @@ namespace System.Net
 
                        if (e == null) { // At least we now where it comes from
                                try {
-#if TARGET_JVM
-                                       throw new Exception ();
-#else
                                        throw new Exception (new System.Diagnostics.StackTrace ().ToString ());
-#endif
                                } catch (Exception e2) {
                                        e = e2;
                                }
index a6a82590de3b8111dcac14abc46f4285d5d01a5b..e6b3c16144400d2d832d839ec8c05a7c8345e650 100644 (file)
@@ -88,12 +88,10 @@ namespace System.Net
                }\r
                \r
                // Methods\r
-#if !TARGET_JVM\r
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)\r
                {\r
                        base.GetObjectData (info, context);\r
                }\r
-#endif \r
 \r
                public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
                {\r
index a2516b0cc39bfa47a5629f32def08a9938fb1e01..ae72774bdf104a93ae2d8fe7bbe6dca7858fdb3f 100644 (file)
@@ -340,13 +340,11 @@ namespace System.Net
 
                        return sb.Append("\r\n").ToString();
                }
-#if !TARGET_JVM
                void ISerializable.GetObjectData (SerializationInfo serializationInfo,
                                                  StreamingContext streamingContext)
                {
                        GetObjectData (serializationInfo, streamingContext);
                }
-#endif
                public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
                {
                        int count = base.Count;
index 9b9fab50815ec1fca4d8e030e70fbb34321d6887..bf0b79eec1b8a5bfef97d32b5c4f5228f9a317c1 100644 (file)
@@ -106,9 +106,7 @@ namespace System.Net
                {\r
                        throw new NotSupportedException ();\r
                }\r
-#if TARGET_JVM //enable overrides for extenders\r
-               public virtual void Dispose()\r
-#elif NET_4_0\r
+#if   NET_4_0\r
                public void Dispose ()\r
 #else\r
                void IDisposable.Dispose()\r
index cdc1cb683c8d4dfc07f31347ce8f87a1dea2ec6e..ca7c74a1edd66e020fc45544542cd900fa4dd57e 100644 (file)
@@ -41,11 +41,9 @@ namespace System.Text.RegularExpressions {
                }
 
                internal static Group Fail = new Group ();
-#if !TARGET_JVM
                public CaptureCollection Captures {
                        get { return captures; }
                }
-#endif
                public bool Success {
                        get { return success; }
                }
index d23358ccb3068f73146116ac549aade692941329..e5a232ab90c251ddfe568b68879bde54461ca4bd 100644 (file)
@@ -91,7 +91,6 @@ namespace System.Text.RegularExpressions {
                        this.machine = machine;
                        this.text_length = text_length;
                }
-#if !TARGET_JVM
                internal Match (Regex regex, IMachine machine, string text, int text_length, int n_groups, 
                                int index, int length, int n_caps) :
                        base (text, index, length, n_caps)
@@ -103,7 +102,6 @@ namespace System.Text.RegularExpressions {
                        this.groups = new GroupCollection (n_groups, regex.Gap);
                        groups.SetValue (this, 0);
                }
-#endif
                internal Regex Regex {
                        get { return regex; }
                }
index 9307a632bce454af5ed31a46eca0102929243409..7071da257bdb0b6906631fe1921896555f89f630 100644 (file)
@@ -47,7 +47,7 @@ namespace System.Text.RegularExpressions {
        [Serializable]
        public partial class Regex : ISerializable {
 
-#if !TARGET_JVM && !FULL_AOT_RUNTIME
+#if !FULL_AOT_RUNTIME
                [MonoTODO]
                public static void CompileToAssembly (RegexCompilationInfo [] regexes, AssemblyName aname)
                {
@@ -306,7 +306,6 @@ namespace System.Text.RegularExpressions {
                                throw new ArgumentOutOfRangeException ("options");
                }
 
-#if !TARGET_JVM
                private void Init ()
                {
                        this.machineFactory = cache.Lookup (this.pattern, this.roptions);
@@ -320,7 +319,6 @@ namespace System.Text.RegularExpressions {
                                this.group_names = this.machineFactory.NamesMapping;
                        }
                }
-#endif
 
                private void InitNewRegex () 
                {
index bafbf39252678f1162856a032cbe42303108b33a..5c3a1a78c06c57f6781ef771a974504f3d6862c0 100644 (file)
@@ -325,9 +325,6 @@ namespace MonoTests.System.Collections.Generic {
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void DeserializeTest ()
                {
                        MemoryStream ms = new MemoryStream ();
index 6ccb40519186965969310af8383e4c0df92df575..3f8b64ec0d0d49705d0fa66ba107c70f1c5bc9e3 100644 (file)
@@ -292,9 +292,6 @@ namespace MonoTests.System.Collections.Generic
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif // TARGET_JVM
                public void DeserializeTest ()
                {
                        MemoryStream ms = new MemoryStream ();
index c966fb3db8ae03cc1a26a54da0dd72bc4903ee51..5ec42d623b433388a662376cf0b8c0761af39d6e 100644 (file)
@@ -45,9 +45,7 @@ namespace MonoTests.System.ComponentModel
                                        numbers, (Type) null);
                                Assert.Fail ("#1");
                        } catch (ArgumentNullException ex) {
-#if !TARGET_JVM
                                Assert.AreEqual ("destinationType", ex.ParamName, "#2");
-#endif
                        }
                }
 
index ea5bd1b316363c2cdb517fb08764bfaffb1404c9..504a30a26829d88ec276062676ee99491828516d 100644 (file)
@@ -206,9 +206,6 @@ namespace MonoTests.System.ComponentModel
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category("NotWorking")]
-#endif
                public void ConvertFrom_String_Flags ()
                {
                        EnumConverter converter = new EnumConverter (typeof (E2));
index 4f3e26ceae99dd63d39ba4502edbef5090516f38..4e635bc451f77eacd29fa714acb37566bd713ff2 100644 (file)
@@ -35,9 +35,6 @@ namespace MonoTests.System.ComponentModel
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD BUG ID: 7229")]
-#endif         
                public void Empty ()
                {
                        PropertyDescriptorCollection descriptors = PropertyDescriptorCollection.Empty;
index 5910489b474e0f0b04b9f646027e5257fb1b485d..df863e939d702170c58a6a0c38751daae2ab04f7 100644 (file)
@@ -18,9 +18,6 @@ namespace MonoTests.System.ComponentModel
        {
 #if !MOBILE
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD BUG ID: 7215, 7216")]
-#endif
                public void DefaultType ()
                {
                        ToolboxItemAttribute attr = new ToolboxItemAttribute (true);
index ebadcbfac03bf638508a57355ea1a6a96d8ca00d..490fc126eb56bb96887e1ba3c80b4f48c56433c2 100644 (file)
@@ -44,9 +44,6 @@ namespace MonoTests.System.ComponentModel
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD BUG ID: 7229")]
-#endif
                public void GetProperties ()
                {
                        PropertyDescriptorCollection properties = null;
index 98d87d4ab9840017f1ff66ac8dd607330142258d..f100f43c3f41a9538aae9b0781dbddc8059e2cc9 100644 (file)
@@ -288,9 +288,7 @@ namespace MonoTests.System.Configuration {
                        // This test will fail when there are newer versions
                        // of the test assemblies - so conditionalize it in
                        // such cases.
-#if TARGET_JVM
-                       string expected = "MonoTests.System.Configuration.ProviderPoker, System.Test, Version=0.0.0.0";
-#elif NET_4_5
+#if   NET_4_5
                        string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_5, Version=0.0.0.0";
 #elif NET_4_0
                        string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_0, Version=0.0.0.0";
index 40939e9ef2dbae39be595d9620c651c91318fade..cba19b160e40c31a3c86371dbd543d6e4210039f 100644 (file)
@@ -44,9 +44,6 @@ namespace MonoTests.System.Configuration
        [TestFixture]
        public class SettingsBaseTest
        {
-#if TARGET_JVM
-               class CustomerException : Exception     { }
-#endif
                class MySettings : SettingsBase
                {
                        [UserScopedSetting] // ignored in non-ApplicationSettingsBase
@@ -235,11 +232,7 @@ namespace MonoTests.System.Configuration
                        try {
                                Assert.AreEqual (100, s.Foo, "#1");
                                Assert.Fail ("#2");
-#if !TARGET_JVM
                        } catch (Win32Exception) {
-#else
-                       } catch (CustomerException) {
-#endif
                        }
                }
 
@@ -264,11 +257,7 @@ namespace MonoTests.System.Configuration
                {
                        public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context, SettingsPropertyCollection props)
                        {
-#if !TARGET_JVM
                                throw new Win32Exception (); // unlikely thrown otherwise.
-#else
-                               throw new CustomerException (); // unlikely thrown otherwise.
-#endif
                        }
                }
 
index b6ddbf164a5e04ef05fc2d35b59923c2f82abef6..1f18e4705d0a176a08e3d422b0fbd480cbeb3370 100755 (executable)
@@ -205,7 +205,6 @@ namespace MonoTests.System.Net.Sockets
                        Assert.AreEqual (CFAConnected, false, "ConnectFail");
                }
                
-#if !TARGET_JVM
                [Test]
 #if !NET_2_0
                [ExpectedException (typeof (ArgumentException))]
@@ -220,7 +219,6 @@ namespace MonoTests.System.Net.Sockets
                                sock.Close ();
                        }
                }
-#endif
                [Test]
                public void TestSelect1 ()
                {
index 488518c38bd2873b44812dfea5f69dad18c536be..9b2453bd6f1d9cade2de2fdc27fecdd5544eabc3 100644 (file)
@@ -13,9 +13,6 @@ using System.Threading;
 using NUnit.Framework;
 
 namespace MonoTests.System.Net.Sockets {
-#if TARGET_JVM
-       [Ignore("UdpClient is not supported - since UDP sockets are not supported")]
-#endif
        [TestFixture]
        public class UdpClientTest {
                [Test] // .ctor ()
index 44797640651c31745e21743823130c9c33b91ec3..db08addfc6b4814dfd9f11ebafd1b0d379acc7f5 100644 (file)
@@ -252,9 +252,6 @@ namespace MonoTests.System.Net
 \r
                [Test]\r
                [ExpectedException (typeof (SocketException))]\r
-#if TARGET_JVM\r
-               [Ignore ("Ignore failures in Sys.Net")]\r
-#endif\r
                public void GetHostByAddressString2 ()\r
                {\r
                        Dns.GetHostByAddress ("123.255.23");\r
index 31af3609801dacf1a5cb3fa0d6e58cc9c128c471..d5314d9caad0443d68634b69e3a6fa13101fc4d5 100644 (file)
@@ -21,10 +21,6 @@ using System.Security.Permissions;
 
 using NUnit.Framework;
 
-#if TARGET_JVM
-using System.Globalization;
-using System.Reflection;
-#endif
 
 namespace MonoTests.System.Net
 {
@@ -363,13 +359,11 @@ namespace MonoTests.System.Net
 #else
                                Assert.AreEqual ("value", ex.Message, "#4");
 #endif
-#if !TARGET_JVM
 #if NET_2_0
                                Assert.IsNotNull (ex.ParamName, "#5");
                                Assert.AreEqual ("value", ex.ParamName, "#6");
 #else
                                Assert.IsNull (ex.ParamName, "#5");
-#endif
 #endif
                                Assert.IsNull (ex.InnerException, "#7");
                        }
@@ -588,11 +582,9 @@ namespace MonoTests.System.Net
                        } catch (WebException ex) {
                                Assert.AreEqual (typeof (WebException), ex.GetType (), "#1");
                                Assert.IsNotNull (ex.Message, "#2");
-#if !TARGET_JVM                                
                                Assert.IsTrue (ex.Message.IndexOf ("FileWebRequestTest.tmp") != -1, "#3");                              
                                Assert.IsNull (ex.Response, "#4");
                                Assert.IsNotNull (ex.InnerException, "#5");
-#endif                         
 
 #if ONLY_1_1
                                FileNotFoundException fnf = ex.InnerException as FileNotFoundException;
@@ -631,12 +623,10 @@ namespace MonoTests.System.Net
                        } catch (ArgumentException ex) {
                                Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
                                Assert.IsNotNull (ex.Message, "#3");
-#if !TARGET_JVM
 #if NET_2_0
                                Assert.AreEqual ("value", ex.ParamName, "#4");
 #else
                                Assert.IsNull (ex.ParamName, "#4");
-#endif
 #endif
                                Assert.IsNull (ex.InnerException, "#5");
                        }
@@ -652,12 +642,10 @@ namespace MonoTests.System.Net
                        } catch (ArgumentException ex) {
                                Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
                                Assert.IsNotNull (ex.Message, "#3");
-#if !TARGET_JVM
 #if NET_2_0
                                Assert.AreEqual ("value", ex.ParamName, "#4");
 #else
                                Assert.IsNull (ex.ParamName, "#4");
-#endif
 #endif
                                Assert.IsNull (ex.InnerException, "#5");
                        }
@@ -713,23 +701,17 @@ namespace MonoTests.System.Net
                        } catch (ArgumentOutOfRangeException ex) {
                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#3");
                                Assert.IsNotNull (ex.Message, "#4");
-#if !TARGET_JVM
                                Assert.IsNotNull (ex.ParamName, "#5");
 #if NET_2_0
                                Assert.IsFalse (ex.ParamName == "value", "#6");
 #else
                                Assert.AreEqual ("value", ex.ParamName, "#6");
-#endif
 #endif
                                Assert.IsNull (ex.InnerException, "#7");
                        }
                }
 
                [Test]
-#if TARGET_JVM
-               //FIXME: include Java serialization compliant tests
-               [Ignore ("The MS compliant binary serialization is not supported")]
-#endif                 
                public void GetObjectData ()
                {
                        FileWebRequest fwr = (FileWebRequest) WebRequest.Create ("file:///test.txt");
@@ -833,9 +815,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The MS compliant binary serialization is not supported")]
-#endif         
                public void Deserialize ()
                {
                        MemoryStream ms = new MemoryStream ();
@@ -888,23 +867,6 @@ namespace MonoTests.System.Net
                        return new Uri ("file:///" + tempFile);
                }
 
-#if TARGET_JVM
-        
-        private bool RunningOnUnix {
-                       get {
-                               Type t = Type.GetType("java.lang.System");
-                               MethodInfo mi = t.GetMethod("getProperty", new Type[] { typeof(string) });
-                               string osName = (string) mi.Invoke(null, new object[] { "os.name" });
-                               
-                               if(osName == null) {
-                                       return false;
-                               }
-                               
-                               return !osName.StartsWith("win", true, CultureInfo.InvariantCulture);
-                       }
-               }
-                               
-#else
                private bool RunningOnUnix {
                        get {
                                // check for Unix platforms - see FAQ for more details
@@ -913,7 +875,6 @@ namespace MonoTests.System.Net
                                return ((platform == 4) || (platform == 128) || (platform == 6));
                        }
                }
-#endif         
 
                private static readonly byte [] _serialized = new byte [] {
 #if NET_2_0
index 2a6b7379cb2e8b6397ac42a214cb5955d98ebd0e..a29c3f9af9775549ddbe5dedd7d240f7901c8c70 100644 (file)
@@ -13,10 +13,6 @@ using System.Net;
 
 using NUnit.Framework;
 
-#if TARGET_JVM
-using System.Globalization;
-using System.Reflection;
-#endif
 
 
 namespace MonoTests.System.Net
@@ -225,23 +221,6 @@ namespace MonoTests.System.Net
                        }
                        return new Uri ("file:///" + tempFile);
                }
-#if TARGET_JVM
-        
-        private bool RunningOnUnix {
-                       get {
-                               Type t = Type.GetType("java.lang.System");
-                               MethodInfo mi = t.GetMethod("getProperty", new Type[] { typeof(string) });
-                               string osName = (string) mi.Invoke(null, new object[] { "os.name" });
-                               
-                               if(osName == null) {
-                                       return false;
-                               }
-                               
-                               return !osName.StartsWith("win", true, CultureInfo.InvariantCulture);
-                       }
-               }
-                               
-#else
                private bool RunningOnUnix {
                        get {
                                // check for Unix platforms - see FAQ for more details
@@ -250,6 +229,5 @@ namespace MonoTests.System.Net
                                return ((platform == 4) || (platform == 128));
                        }
                }
-#endif         
        }
 }
index f499921e47eeee0b3fc74a589ea75098a453f02a..822bced92518cc7066b3ea109dd0b391c5db27df 100644 (file)
@@ -45,9 +45,6 @@ using NUnit.Framework;
 namespace MonoTests.System.Net {
        
        [TestFixture]
-#if TARGET_JVM 
-       [Ignore ("The class HttpListener is not supported")]
-#endif
        public class HttpListener2Test {
                
                private HttpListener _listener = null;
index 82f3c046825d2586c01b5a7501bcd2b296daaca4..d1de09391e8f097b76394663323aff58e1107f04 100644 (file)
@@ -33,9 +33,6 @@ using NUnit.Framework;
 
 namespace MonoTests.System.Net {
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class HttpListenerBasicIdentity - is not supported")]
-#endif
        public class HttpListenerBasicIdentityTest {
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
index b30b7cc6bea8856ea812315469894b58c530ebc5..b099f07d75ebc9f2aece60592551b7ae33d8e77f 100644 (file)
@@ -34,11 +34,7 @@ using HLPC=System.Net.HttpListenerPrefixCollection;
 
 namespace MonoTests.System.Net {
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class System.Net.HttpListenerPrefixCollection - is not supported")]
-#endif
        public class HttpListenerPrefixCollectionTest {
-#if !TARGET_JVM
                // NL -> Not listening -> tests when listener.IsListening == false
                [Test]
                public void NL_DefaultProperties ()
@@ -250,7 +246,6 @@ namespace MonoTests.System.Net {
                        }
                        Assert.AreEqual (items, 1);
                }
-#endif
        }
 }
 #endif
index afe81eb33c3d394490881af4d3e95c8a329e73a7..4d8564237d6a79574756ea4454e763c8b6262e4b 100644 (file)
@@ -38,9 +38,6 @@ using NUnit.Framework;
 namespace MonoTests.System.Net
 {
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class HttpListener is not supported")]
-#endif
        public class HttpListenerRequestTest
        {
                [Test]
index 83a335bc9201f6164208cd51817caf050d30f3fe..25f7b96a9b935a7cabf64a58906476934aa19824 100644 (file)
@@ -35,11 +35,7 @@ using NUnit.Framework;
 
 namespace MonoTests.System.Net {
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class HttpListener is not implemented")]
-#endif
        public class HttpListenerTest {
-#if !TARGET_JVM
                [Test]
                public void DefaultProperties ()
                {
@@ -454,7 +450,6 @@ namespace MonoTests.System.Net {
                                Event.Close ();
                        }
                }
-#endif
        }
 }
 #endif
index ccf2484dfdddf2db7e554b5b4176c004fc9f9a94..889ad1b0a7c9785aae07b1b882ea1fc00716d176 100644 (file)
@@ -45,9 +45,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Ignore failures in Sys.Net")]
-#endif
                public void Proxy_Null ()
                {
                        HttpWebRequest req = (HttpWebRequest) WebRequest.Create ("http://www.google.com");
@@ -58,9 +55,6 @@ namespace MonoTests.System.Net
 
                [Test]
                [Category("InetAccess")]
-#if TARGET_JVM
-               [Ignore ("NMA - wrong cookies number returned")]
-#endif
                public void Sync ()
                {
                        HttpWebRequest req = (HttpWebRequest) WebRequest.Create ("http://www.google.com");
@@ -151,7 +145,7 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                [Test]
                [Ignore ("Fails on MS.NET")]
                public void SslClientBlock ()
@@ -186,9 +180,6 @@ namespace MonoTests.System.Net
                }
 #endif
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void Missing_ContentEncoding ()
                {
                        ServicePointManager.CertificatePolicy = new AcceptAllPolicy ();
@@ -211,9 +202,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void BadServer_ChunkedClose ()
                {
                        // The server will send a chunked response without a 'last-chunked' mark
@@ -1002,9 +990,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                [Ignore ("This does not timeout any more. That's how MS works when reading small responses")]
                public void ReadTimeout ()
                {
@@ -1039,9 +1024,6 @@ namespace MonoTests.System.Net
                }
 
                [Test] // bug #324300
-#if TARGET_JVM
-               [Category("NotWorking")]
-#endif
                public void AllowAutoRedirect ()
                {
                        IPEndPoint localEP = new IPEndPoint (IPAddress.Loopback, 8765);
@@ -2563,7 +2545,7 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                class SslHttpServer : HttpServer {
                        X509Certificate _certificate;
 
@@ -2894,9 +2876,6 @@ namespace MonoTests.System.Net
                }
 
                [Test] // bug #324182
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void CanTimeout ()
                {
                        IPEndPoint ep = new IPEndPoint (IPAddress.Loopback, 9128);
index dd9749175257522161bea694dcb0450a69abf99b..5866c34bbccbb17c63151bb8d76b6ea919ea7bba 100644 (file)
@@ -666,9 +666,6 @@ namespace MonoTests.System.Net
 
 #if NET_2_0
                [Test] // bug #324182
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void CanTimeout ()
                {
                        IPEndPoint ep = new IPEndPoint (IPAddress.Loopback, 8000);
index 1d389e131dd5c38121cce341aedc8439aff6f81d..a133684a8c63712ac2cde3c88724628287ca0bfc 100644 (file)
@@ -416,9 +416,6 @@ public class IPAddressTest
        }
 
        [Test]
-#if TARGET_JVM
-       [Ignore ("TD BUG ID: 7213")]
-#endif
        public void Constructor0_Address_Invalid ()
        {
                try {
@@ -473,9 +470,6 @@ public class IPAddressTest
        }
 
        [Test]
-#if TARGET_JVM
-       [Ignore ("TD BUG ID: 7213")]
-#endif
        public void Constructor1_Address_4Byte ()
        {
                byte [] bytes = new byte [4] { 192, 202, 112, 37 };
index 23b8d2b67c10f4dce49a0a80a4a368231a456584..f0c3272f721ef14a3340283fc4c102accd8cf1b3 100644 (file)
@@ -44,9 +44,6 @@ public class ServicePointManagerTest
 \r
         [Test, ExpectedException (typeof (InvalidOperationException))]\r
                [Category ("InetAccess")]\r
-#if TARGET_JVM\r
-       [Ignore ("Unsupported property - ServicePointManager.MaxServicePoints")]\r
-#endif\r
         public void MaxServicePointManagers ()\r
         {\r
                Assert.AreEqual (0, ServicePointManager.MaxServicePoints, "#1");\r
index 457dc5b29f1ec4e1daeb3553b813d97e0f23d5a9..98189c285be16909af5b62eb6199c8247524114b 100644 (file)
@@ -35,9 +35,6 @@ public class ServicePointTest
 \r
         [Test]\r
                [Category ("InetAccess")]\r
-#if TARGET_JVM\r
-       [Ignore ("Unsupported - ServicePointManager.FindServicePoint")]\r
-#endif\r
         public void All ()\r
         {\r
                ServicePoint p = ServicePointManager.FindServicePoint (new Uri ("mailto:xx@yyy.com"));\r
@@ -119,9 +116,6 @@ public class ServicePointTest
 \r
        [Test]\r
        [Category ("InetAccess")]\r
-#if TARGET_JVM\r
-       [Ignore ("The System.Net.ServicePointManager.FindServicePoint(Uri) is not supported")]\r
-#endif \r
        public void ConnectionLimit ()\r
        {               \r
                // the default is already 2, just in case it isn't..\r
@@ -155,9 +149,6 @@ public class ServicePointTest
 #if NET_2_0\r
        [Test]\r
        [Category ("InetAccess")]\r
-#if TARGET_JVM\r
-       [Ignore ("The System.Net.ServicePointManager.FindServicePoint(Uri) is not supported")]\r
-#endif \r
        public void EndPointBind ()\r
        {\r
                Uri uri = new Uri ("http://www.go-mono.com/");\r
@@ -166,26 +157,22 @@ public class ServicePointTest
                HttpWebRequest req = (HttpWebRequest) WebRequest.Create (uri);\r
 \r
                bool called = false;\r
-#if !TARGET_JVM\r
                sp.BindIPEndPointDelegate = delegate {\r
                        Assert.IsTrue (!called);\r
                        called = true;\r
                        return null;\r
                };\r
-#endif\r
                req.GetResponse ().Close ();\r
 \r
                Assert.IsTrue (called);\r
 \r
                req = (HttpWebRequest) WebRequest.Create (uri);\r
                called = false;\r
-#if !TARGET_JVM\r
                sp.BindIPEndPointDelegate = delegate(ServicePoint point, IPEndPoint remote, int times) {\r
                        Assert.IsTrue (times < 5);\r
                        called = true;\r
                        return new IPEndPoint(IPAddress.Parse("0.0.0.0"), 12345 + times);\r
                };\r
-#endif\r
                req.GetResponse ().Close ();\r
 \r
                Assert.IsTrue (called);\r
index 0e82e6314c7abbe5a14741ef7959d81d1885ab02..9e4792acb94d12ae859687586c5b0a328e8ad967 100644 (file)
@@ -277,11 +277,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               //FIXME: include Java serialization compliant tests - the order of object
-               // in SerializationInfo should stay same to MS format...
-               [Ignore ("The MS compliant binary serialization is not supported")]
-#endif                 
                public void GetObjectData ()
                {
                        SerializationInfo si = new SerializationInfo (typeof (WebHeaderCollection),
@@ -342,10 +337,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               //FIXME: include Java serialization compliant tests
-               [Ignore ("The MS compliant binary serialization is not supported")]
-#endif         
                public void Serialize ()
                {
                        WebHeaderCollection headers = new WebHeaderCollection ();
@@ -366,10 +357,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               //FIXME: include Java serialization compliant tests
-               [Ignore ("The MS compliant binary serialization format is not supported")]
-#endif                         
                public void Deserialize ()
                {
                        MemoryStream ms = new MemoryStream ();
index 49c7bbd7c93f229397cc09ab0f5eb2f8411d7917..2e3ffcb33dfb73f24627013796a7d69c4c5c06c1 100644 (file)
@@ -171,9 +171,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("TD BUG ID: 7213")]
-#endif         
                public void IsByPassed_Host_Null ()
                {
                        WebProxy p = new WebProxy ("http://proxy.contoso.com", true);
@@ -229,9 +226,6 @@ namespace MonoTests.System.Net
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("The MS compliant binary serialization is not supported")]
-#endif         
                public void GetObjectData ()
                {
                        SerializationInfo si = new SerializationInfo (typeof (WebHeaderCollection),
index 1d14bb8c19f2a02aff32f05bd3d09fdd7db0147c..eb5c5c5fd711ff7007b59574cc844e70fd31d905 100644 (file)
@@ -60,9 +60,6 @@ namespace MonoTests.System.Net {
 
                [Test]
                [Category ("NotDotNet")]
-#if TARGET_JVM
-               [Ignore ("TD #6954")]
-#endif
                public void HtmlEncode_XSS ()
                {
                        string problem = "\xff1cscript\xff1e";  // unicode looks alike <script>
index bf3627336f82f5f71aa938597dd7fd4db0b59a26..71566982148cf4d986b28cecd3398c0b49a49981 100644 (file)
@@ -38,11 +38,7 @@ using System.Security.Cryptography.X509Certificates;
 namespace MonoTests.System.Security.Cryptography {
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class System.Security.Cryptography.AsnEncodedData - is not supported")]
-#endif
        public class AsnEncodedDataTest {
-#if !TARGET_JVM
                static byte[] asnNullBytes = { 0x05, 0x00 };
                static string asnNullString = "05 00";
                static byte[] asnLongBytes = { 0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01 };
@@ -284,7 +280,6 @@ namespace MonoTests.System.Security.Cryptography {
                        Assert.AreEqual ("Subject Alternative Name", aed.Oid.FriendlyName, "FriendlyName");
                        // anyway the answer is most probably CryptoAPI
                }
-#endif
        }
 }
 
index 282d6999d2801223f981aaa6b543bf25ce56f52e..8a3d778b7c9026b6e1fd8b620664d4c444bfa4e3 100644 (file)
@@ -17,11 +17,7 @@ using System.Security.Cryptography;
 namespace MonoTests.System.Security.Cryptography {
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class System.Security.Cryptography.OidCollection - is not supported")]
-#endif
        public class OidCollectionTest {
-#if !TARGET_JVM
 
                [Test]
                public void Constructor () 
@@ -73,7 +69,6 @@ namespace MonoTests.System.Security.Cryptography {
                        Oid[] array = null;
                        oc.CopyTo (array, 0);
                }
-#endif
        }
 }
 
index 84085f137880d4eb9d52081c75ec0ff1d106e538..91dd1e55fe52814f82556ee31ace7a2965acad67 100644 (file)
@@ -17,11 +17,7 @@ using System.Security.Cryptography;
 namespace MonoTests.System.Security.Cryptography {
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class System.Security.Cryptography.OidEnumerator - is not supported")]
-#endif
        public class OidEnumeratorTest {
-#if !TARGET_JVM
                private OidEnumerator GetEnumerator () 
                {
                        OidCollection oc = new OidCollection ();
@@ -79,8 +75,7 @@ namespace MonoTests.System.Security.Cryptography {
                        enumerator.Reset ();
                        Assert.IsNotNull (enumerator.Current, "Current after reset");
                }
-#endif
        }
 }
 
-#endif
\ No newline at end of file
+#endif
index 85fb05654d427db329fcdeef9b2b38a66311e7f8..8555f9e21e2bd4253585509f6910de42697d244c 100644 (file)
@@ -37,12 +37,8 @@ using System.Security.Cryptography;
 namespace MonoTests.System.Security.Cryptography {
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("The class System.Security.Cryptography.Oid - is not supported")]
-#endif
 
        public class OidTest {
-#if !TARGET_JVM
 
                static string invalidOid = "1.0";
                static string invalidName = "friendlyName";
@@ -185,7 +181,6 @@ namespace MonoTests.System.Security.Cryptography {
 
                        // TODO: add other well known oid as we find them
                }
-#endif
        }
 }
 
index cb640ab44d8e3853ac84819727f1022874db825d..f0a67b7a7cd700cba440bd54e5f757874df0bd66 100644 (file)
@@ -567,12 +567,10 @@ namespace MonoTests.System
                        Assert.AreEqual ("/", uri.AbsolutePath, "#7e");
                        Assert.AreEqual ("/", uri.PathAndQuery, "#7f");
                        Assert.AreEqual ("file://one_file.txt/", uri.GetLeftPart (UriPartial.Path), "#7g");
-#if !TARGET_JVM
                        if (isWin32)
                                Assert.AreEqual ("\\\\one_file.txt\\", uri.LocalPath, "#7b");
                        else
                                Assert.AreEqual ("/", uri.LocalPath, "#7b");
-#endif
                        Assert.AreEqual ("file", uri.Scheme, "#7c");
                        Assert.AreEqual ("one_file.txt", uri.Host, "#7d");
                }
index c3016efc17b76cf43d207eef2bc4d746440179a6..4d3b0e9ccad29da8fe6ab24039b66a14a0616725 100644 (file)
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-// NumberFormatter is shared with Grasshopper and hence the #if TARGET_JVM for
-// marking the use of unsafe code that is not supported in Grasshopper.
-#if !TARGET_JVM
-#define UNSAFE_TABLES
-#endif
-
 using System.Globalization;
 using System.Text;
 using System.Threading;
@@ -72,7 +66,6 @@ namespace System
                const double MinRoundtripVal = -1.79769313486231E+308;
                const double MaxRoundtripVal = 1.79769313486231E+308;
 
-#if UNSAFE_TABLES
                // The below arrays are taken from mono/metatdata/number-formatter.h
 
                private static readonly unsafe ulong* MantissaBitsTable;
@@ -96,9 +89,7 @@ namespace System
                                out DigitLowerTable, out DigitUpperTable, out TenPowersList, out DecHexDigits);
                }
 
-               unsafe
-#endif
-               static long GetTenPowerOf(int i)
+               unsafe static long GetTenPowerOf(int i)
                {
                        return TenPowersList [i];
                }
@@ -212,10 +203,7 @@ namespace System
 
                // Helper to translate an int in the range 0 .. 9999 to its
                // Hexadecimal digits representation.
-#if UNSAFE_TABLES
-               unsafe
-#endif
-               private static uint FastToDecHex (int val)
+               unsafe private static uint FastToDecHex (int val)
                {
                        if (val < 100)
                                return (uint)DecHexDigits [val];
@@ -440,10 +428,7 @@ namespace System
                        _decPointPos = _digitsLen = DecHexLen ();
                }
 
-#if UNSAFE_TABLES // No unsafe code under TARGET_JVM
-               unsafe
-#endif
-               private void Init (string format, double value, int defPrecision)
+               unsafe private void Init (string format, double value, int defPrecision)
                {
                        Init (format);
 
@@ -1236,17 +1221,11 @@ namespace System
                        return new string (_cbuf, 0, _ind);
                }
 
-#if UNSAFE_TABLES // No unsafe code under TARGET_JVM
-               unsafe
-#endif
-               private string FormatHexadecimal (int precision)
+               unsafe private string FormatHexadecimal (int precision)
                {
                        int size = Math.Max (precision, _decPointPos);
-#if UNSAFE_TABLES
                        char* digits = _specifierIsUpper ? DigitUpperTable : DigitLowerTable;
-#else
-                       char[] digits = _specifierIsUpper ? DigitUpperTable : DigitLowerTable;
-#endif
+
                        ResetCharBuf (size);
                        _ind = size;
                        ulong val = _val1 | ((ulong)_val2 << 32);
@@ -1769,10 +1748,7 @@ namespace System
                        _cbuf [_ind++] = (char)('0' | v & 0xf);
                }
 
-#if UNSAFE_TABLES // No unsafe code under TARGET_JVM
-               unsafe
-#endif
-               private void FastAppendDigits (int val, bool force)
+               unsafe private void FastAppendDigits (int val, bool force)
                {
                        int i = _ind;
                        int digits;
index b429c6437efaf810ee737cbbeaaa1606cbce110b..1a89b8eedb2130b48f03a5d39e4d2a04da29e962 100644 (file)
@@ -607,7 +607,6 @@ namespace MonoTests.System.Collections.Generic {
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")] // BUGBUG Very very slow on TARGET_JVM.
                public void SerializationTest()
                {
                        for (int i = 0; i < 50; i++)
index c5966206cd824b8cedc516c180aa6f1a4a0fe848..0dc4231858d9165a028c2be176190532b13610bc 100644 (file)
@@ -345,7 +345,6 @@ namespace MonoTests.System.Collections.Generic {
 #if !NET_4_0 // FIXME: the blob contains the 2.0 mscorlib version
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void SerializeTest ()
                {
                        List <int> list = new List <int> ();
@@ -353,11 +352,7 @@ namespace MonoTests.System.Collections.Generic {
                        list.Add (0);
                        list.Add (7);
 
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        MemoryStream ms = new MemoryStream ();
                        bf.Serialize (ms, list);
 
@@ -371,18 +366,13 @@ namespace MonoTests.System.Collections.Generic {
 #endif
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void DeserializeTest ()
                {
                        MemoryStream ms = new MemoryStream ();
                        ms.Write (_serializedList, 0, _serializedList.Length);
                        ms.Position = 0;
 
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        List<int> list = (List<int>) bf.Deserialize (ms);
                        Assert.AreEqual (3, list.Count, "#1");
                        Assert.AreEqual (5, list [0], "#2");
index 99f515fab030d2f1e0a5d803168a2c2b41bdbefb..bc3bc99226d7c4b3b4b70d8b230b79aac5c12869 100644 (file)
@@ -183,11 +183,7 @@ namespace MonoTests.System.Collections
                [Test]
                public void Deserialize ()
                {
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
 
                        MemoryStream ms = new MemoryStream (serialized_en_us);
                        CaseInsensitiveHashCodeProvider enus = (CaseInsensitiveHashCodeProvider) bf.Deserialize (ms);
index 4edfd00b08c3668128b71b71714714647f5ffb1c..544ade9f826aa843aaf821646ddfedeb83e6227d 100644 (file)
@@ -491,13 +491,6 @@ public class HashtableTest {
                        h['b'] = 2;\r
                        DictionaryEntry[] o = new DictionaryEntry[2];\r
                        h.CopyTo(o,0);\r
-#if TARGET_JVM // Hashtable is not an ordered collection!\r
-                       if (o[0].Key.Equals('b')) {\r
-                               DictionaryEntry v = o[0];\r
-                               o[0] = o[1];\r
-                               o[1] = v;\r
-                       }\r
-#endif // TARGET_JVM\r
                        Assert.AreEqual ('a', o[0].Key, "first copy fine.");\r
                        Assert.AreEqual (1, o[0].Value, "first copy fine.");\r
                        Assert.AreEqual ('b', o[1].Key, "second copy fine.");\r
@@ -543,7 +536,6 @@ public class HashtableTest {
        }\r
        \r
        [Test]\r
-       [Category ("TargetJvmNotWorking")]\r
        public void TestSerialization2 () {\r
                // Test from bug #70570\r
                MemoryStream stream = new MemoryStream();\r
index 08b6130106f909377682f626c6bede3d743062c9..5289f9448904a07d0463be3576bda522cc1c66c0 100644 (file)
@@ -881,7 +881,6 @@ namespace MonoTests.System.Collections
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void SerializeTest ()
                {
                        SortedList sl1 = new SortedList ();
@@ -889,11 +888,7 @@ namespace MonoTests.System.Collections
                        sl1.Add (0, "B");
                        sl1.Add (7, "C");
 
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        bf.AssemblyFormat = FormatterAssemblyStyle.Full;
                        MemoryStream ms = new MemoryStream ();
                        bf.Serialize (ms, sl1);
@@ -908,7 +903,6 @@ namespace MonoTests.System.Collections
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void Keys_Serialize ()
                {
                        SortedList sl = new SortedList ();
@@ -917,11 +911,7 @@ namespace MonoTests.System.Collections
                        sl.Add (7, "C");
 
                        IList keys1 = (IList) sl.Keys;
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        bf.AssemblyFormat = FormatterAssemblyStyle.Full;
                        MemoryStream ms = new MemoryStream ();
                        bf.Serialize (ms, keys1);
@@ -936,7 +926,6 @@ namespace MonoTests.System.Collections
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void Values_Serialize ()
                {
                        SortedList sl = new SortedList ();
@@ -945,11 +934,7 @@ namespace MonoTests.System.Collections
                        sl.Add (7, "C");
 
                        IList values1 = (IList) sl.Values;
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        bf.AssemblyFormat = FormatterAssemblyStyle.Full;
                        MemoryStream ms = new MemoryStream ();
                        bf.Serialize (ms, values1);
@@ -967,11 +952,7 @@ namespace MonoTests.System.Collections
                [Category ("NotWorking")]
                public void Values_Deserialize ()
                {
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
 
                        MemoryStream ms = new MemoryStream ();
                        ms.Write (_serializedValues, 0, _serializedValues.Length);
index e5629d2eb09ba6357a3da0a53164244e94ef5c71..496c20fe736f9d0f67b3cc1f96c5043a665ccff0 100644 (file)
@@ -235,7 +235,6 @@ namespace MonoTests.System.Globalization
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")] //OptionalCalendars not yet supported for TARGET_JVM.
                // make sure that all CultureInfo holds non-null calendars.
                public void OptionalCalendars ()
                {
index ab2dac11edd9e45201d7c5cc6084267ca1b3cb5e..7850f3f58dc408cac23515c1bbff130f05132d03 100644 (file)
@@ -133,7 +133,6 @@ namespace MonoTests.System.Globalization
                        Assert.AreEqual ("dddd, d' ta\\' 'MMMM yyyy", culture.DateTimeFormat.LongDatePattern);
                }
 
-#if !TARGET_JVM
                [Test]
                public void Bug78569 ()
                {
@@ -143,7 +142,6 @@ namespace MonoTests.System.Globalization
                        DateTime dt2 = DateTime.Parse (s, ci);
                        Assert.AreEqual (dt.Month, dt2.Month);
                }
-#endif
        }
 }
 
index 76edd4cff51b25a4b3db939bc8853774ba302c1a..664249597e26ea41bac6a70147aa1bc7f7b1f51a 100644 (file)
@@ -78,11 +78,7 @@ namespace MonoTests.System.Globalization {
                public void DeserializeKnownValue ()
                {
                        MemoryStream ms = new MemoryStream (serialized_daylighttime);
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        DaylightTime dt = (DaylightTime) bf.Deserialize (ms);
                        Assert.AreEqual (DateTime.MinValue, dt.Start, "Start");
                        Assert.AreEqual (DateTime.MaxValue, dt.End, "End");
index 07a8cd33acd62673dd05f3a941b49bc1134f553a..699f94be8031c1c8a562a270552f2c2cd2cb87dd 100644 (file)
@@ -967,7 +967,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM
                public void LastAccessTime ()
                {
                        DirectoryInfo info = new DirectoryInfo (TempFolder);
@@ -975,7 +974,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM
                public void LastAccessTimeUtc ()
                {
                        DirectoryInfo info = new DirectoryInfo (TempFolder);
@@ -983,7 +981,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM
                public void CreationTime ()
                {
                        DirectoryInfo info = new DirectoryInfo (TempFolder);
@@ -991,7 +988,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM
                public void CreationTimeUtc ()
                {
                        DirectoryInfo info = new DirectoryInfo (TempFolder);
index 77a2746f5f59fe48f30b06ecbd479bf080b64a2f..82536169f59ecfa67615e2e383643ab1c0dcef25 100644 (file)
@@ -364,7 +364,7 @@ public class DirectoryTest
                Assert.IsFalse (Directory.Exists (null as string));\r
        }\r
 \r
-#if !TARGET_JVM && !MOBILE // We don't support yet the Process class.\r
+#if !MOBILE // We don't support yet the Process class.\r
        [Test] // bug #78239\r
        public void ExistsAccessDenied ()\r
        {\r
@@ -385,7 +385,6 @@ public class DirectoryTest
 #endif\r
        \r
        [Test]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        [ExpectedException(typeof(ArgumentNullException))]\r
        public void GetCreationTimeException1 ()\r
        {\r
@@ -394,7 +393,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeException2 ()\r
        {\r
                Directory.GetCreationTime (string.Empty);\r
@@ -404,7 +402,6 @@ public class DirectoryTest
 #if !NET_2_0\r
        [ExpectedException(typeof(IOException))]\r
 #endif\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeException_NonExistingPath ()\r
        {\r
                string path = TempFolder + DSC + "DirectoryTest.GetCreationTime.1";\r
@@ -428,7 +425,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeException4 ()\r
        {\r
                Directory.GetCreationTime ("    ");\r
@@ -436,7 +432,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeException5 ()\r
        {\r
                Directory.GetCreationTime (Path.InvalidPathChars [0].ToString ());\r
@@ -444,7 +439,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeUtcException1 ()\r
        {\r
                Directory.GetCreationTimeUtc (null as string);\r
@@ -452,7 +446,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeUtcException2 ()\r
        {\r
                Directory.GetCreationTimeUtc (string.Empty);\r
@@ -462,7 +455,6 @@ public class DirectoryTest
 #if !NET_2_0\r
        [ExpectedException (typeof (IOException))]\r
 #endif\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeUtc_NonExistingPath ()\r
        {\r
                string path = TempFolder + DSC + "DirectoryTest.GetCreationTimeUtc.1";\r
@@ -486,7 +478,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeUtcException4 ()\r
        {\r
                Directory.GetCreationTimeUtc ("    ");\r
@@ -494,7 +485,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM\r
        public void GetCreationTimeUtcException5 ()\r
        {\r
                Directory.GetCreationTime (Path.InvalidPathChars [0].ToString ());\r
@@ -502,7 +492,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTime_Null ()\r
        {\r
                Directory.GetLastAccessTime (null as string);\r
@@ -510,7 +499,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeException2 ()\r
        {\r
                Directory.GetLastAccessTime (string.Empty);\r
@@ -520,7 +508,6 @@ public class DirectoryTest
 #if !NET_2_0\r
        [ExpectedException (typeof (IOException))]\r
 #endif\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTime_NonExistingPath ()\r
        {\r
                string path = TempFolder + DSC + "DirectoryTest.GetLastAccessTime.1";\r
@@ -545,7 +532,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeException4 ()\r
        {\r
                Directory.GetLastAccessTime ("    ");\r
@@ -553,7 +539,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeException5 ()\r
        {\r
                Directory.GetLastAccessTime (Path.InvalidPathChars [0].ToString ());\r
@@ -561,7 +546,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeUtc_Null ()\r
        {\r
                Directory.GetLastAccessTimeUtc (null as string);\r
@@ -569,7 +553,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeUtcException2 ()\r
        {\r
                Directory.GetLastAccessTimeUtc (string.Empty);\r
@@ -579,7 +562,6 @@ public class DirectoryTest
 #if !NET_2_0\r
        [ExpectedException (typeof (IOException))]\r
 #endif\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeUtc_NonExistingPath ()\r
        {\r
                string path = TempFolder + DSC + "DirectoryTest.GetLastAccessTimeUtc.1";\r
@@ -602,7 +584,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeUtcException4 ()\r
        {\r
                Directory.GetLastAccessTimeUtc ("    ");\r
@@ -610,7 +591,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM\r
        public void GetLastAccessTimeUtcException5 ()\r
        {\r
                Directory.GetLastAccessTimeUtc (Path.InvalidPathChars [0].ToString ());\r
@@ -1002,7 +982,6 @@ public class DirectoryTest
        }\r
        \r
        [Test]\r
-       [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM\r
        public void CreationTime ()\r
        {\r
                if (RunningOnUnix)\r
@@ -1053,7 +1032,6 @@ public class DirectoryTest
        }\r
 \r
        [Test]\r
-       [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM\r
        public void LastAccessTime ()\r
        {\r
                string path = TempFolder + DSC + "DirectoryTest.AccessTime.1";\r
@@ -1275,7 +1253,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeException1 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1284,7 +1261,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeException2 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1293,7 +1269,6 @@ public class DirectoryTest
        \r
        [Test]\r
        [ExpectedException(typeof(FileNotFoundException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeException3 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1308,7 +1283,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeException4 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1317,7 +1291,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeException5 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1343,7 +1316,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeUtcException1 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1352,7 +1324,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeUtcException2 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1361,7 +1332,6 @@ public class DirectoryTest
        \r
        [Test]\r
        [ExpectedException(typeof(FileNotFoundException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeUtcException3 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1376,7 +1346,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeUtcException4 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1385,7 +1354,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM\r
        public void SetLastAccessTimeUtcException5 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1410,7 +1378,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeException1 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1419,7 +1386,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeException2 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1428,7 +1394,6 @@ public class DirectoryTest
        \r
        [Test]\r
        [ExpectedException(typeof(FileNotFoundException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeException3 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1444,7 +1409,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeException4 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1453,7 +1417,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeException5 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1480,7 +1443,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentNullException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeUtcException1 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1489,7 +1451,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeUtcException2 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1498,7 +1459,6 @@ public class DirectoryTest
        \r
        [Test]\r
        [ExpectedException(typeof(FileNotFoundException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeUtcException3 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1515,7 +1475,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeUtcException4 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
@@ -1524,7 +1483,6 @@ public class DirectoryTest
 \r
        [Test]\r
        [ExpectedException(typeof(ArgumentException))]\r
-       [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM\r
        public void SetCreationTimeUtcException5 ()\r
        {\r
                DateTime time = new DateTime (2003, 4, 6, 6, 4, 2);\r
index eb2a0edd6e4ca3432f28fb96604da899b5486e98..297a54bf74b853ee15086f6aa7de325687526cf7 100644 (file)
@@ -1147,7 +1147,6 @@ namespace MonoTests.System.IO
                }
                
                [Test]
-               [Category("TargetJvmNotSupported")] // File sharing not supported for TARGET_JVM
                public void OpenRead_FileLock ()
                {
                        string path = TempFolder + DSC + "FIT.OpenReadIOException.Test";
index 52038c997b1491ad5e90f3ba7cbd2505d46677e0..445c646b7d4cd011eab33c9868c5e7e7dc05a3da 100644 (file)
@@ -63,12 +63,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#4");
                        Assert.AreEqual ("message", fnf.Message, "#5");
                        Assert.IsNull (fnf.FusionLog, "#6");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": message"),"#7");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": message",
                                fnf.ToString (), "#7");
-#endif
                }
 
                [Test]
@@ -84,12 +80,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#4");
                        Assert.AreEqual (string.Empty, fnf.Message, "#5");
                        Assert.IsNull (fnf.FusionLog, "#6");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": "), "#7");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": ",
                                fnf.ToString (), "#7");
-#endif
                }
 
                [Test]
@@ -108,7 +100,7 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#4"); // File or assembly name (null), or ...
 #endif
                        Assert.IsNull (fnf.FusionLog, "#5");
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
                        Assert.AreEqual (fnf.GetType ().FullName + ": ",
                                fnf.ToString (), "#6");
 #else
@@ -132,13 +124,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#5");
                        Assert.AreEqual ("message", fnf.Message, "#6");
                        Assert.IsNull (fnf.FusionLog, "#7");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": message ---> "
-                + ame.GetType().FullName + ": something"), "#8");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": message ---> "
                                + ame.GetType ().FullName + ": something", fnf.ToString (), "#8");
-#endif
                }
 
                [Test]
@@ -156,13 +143,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#5");
                        Assert.AreEqual (string.Empty, fnf.Message, "#6");
                        Assert.IsNull (fnf.FusionLog, "#7");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ":  ---> "
-                + ame.GetType().FullName + ": something"), "#8");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ":  ---> "
                                + ame.GetType ().FullName + ": something", fnf.ToString (), "#8");
-#endif
                }
 
                [Test]
@@ -184,13 +166,8 @@ namespace MonoTests.System.IO {
 #endif
                        Assert.IsNull (fnf.FusionLog, "#6");
 #if NET_2_0
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ":  ---> "
-                + ame.GetType().FullName + ": something"), "#7");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ":  ---> "
                                + ame.GetType ().FullName + ": something", fnf.ToString (), "#7");
-#endif
 #else
                        Assert.IsTrue (fnf.ToString ().StartsWith (fnf.GetType ().FullName), "#7");
                        Assert.IsFalse (fnf.ToString ().IndexOf (Environment.NewLine) != -1, "#9");
@@ -211,12 +188,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#4");
                        Assert.AreEqual ("message", fnf.Message, "#5");
                        Assert.IsNull (fnf.FusionLog, "#6");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": message"), "#7");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": message",
                                fnf.ToString (), "#7");
-#endif
                }
 
                [Test]
@@ -260,12 +233,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#5");
                        Assert.AreEqual ("message", fnf.Message, "#6");
                        Assert.IsNull (fnf.FusionLog, "#7");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": message"), "#8");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": message",
                                fnf.ToString (), "#8");
-#endif
                }
 
                [Test]
@@ -282,13 +251,9 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#A4");
                        Assert.AreEqual ("message", fnf.Message, "#A5");
                        Assert.IsNull (fnf.FusionLog, "#A6");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": message"), "#A7");
-#else
                
                        Assert.AreEqual (fnf.GetType ().FullName + ": message",
                                fnf.ToString (), "#A7");
-#endif
 
                        fnf = new FileNotFoundException (string.Empty, (string) null);
 
@@ -300,12 +265,8 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#B4");
                        Assert.AreEqual (string.Empty, fnf.Message, "#B5");
                        Assert.IsNull (fnf.FusionLog, "#B6");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": "), "#B7");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": ",
                                fnf.ToString (), "#B7");
-#endif
                }
 
                [Test]
@@ -323,11 +284,7 @@ namespace MonoTests.System.IO {
                        Assert.IsNotNull (fnf.Message, "#5");
                        Assert.AreEqual (string.Empty, fnf.Message, "#6");
                        Assert.IsNull (fnf.FusionLog, "#7");
-#if TARGET_JVM
-            Assert.IsTrue(fnf.ToString().StartsWith(fnf.GetType().FullName + ": "), "#8");
-#else
                        Assert.AreEqual (fnf.GetType ().FullName + ": ", fnf.ToString (), "#8");
-#endif
                }
 
                [Test]
@@ -349,9 +306,7 @@ namespace MonoTests.System.IO {
                        Assert.IsNull (fnf.FusionLog, "#5");
                        Assert.IsTrue (fnf.ToString ().StartsWith (fnf.GetType ().FullName
                                + ": "), "#6");
-#if !TARGET_JVM
                        Assert.IsFalse (fnf.ToString ().IndexOf (Environment.NewLine) != -1, "#7");
-#endif
                        Assert.IsFalse (fnf.ToString ().IndexOf ("''") != -1, "#8");
                }
 
@@ -422,9 +377,7 @@ namespace MonoTests.System.IO {
                        Assert.IsNull (fnf.FusionLog, "#B6");
                        Assert.IsTrue (fnf.ToString ().StartsWith (fnf.GetType ().FullName
                                + ": "), "#B7");
-#if !TARGET_JVM
                        Assert.IsFalse (fnf.ToString ().IndexOf (Environment.NewLine) != -1, "#B8");
-#endif
 #if NET_2_0
                        Assert.IsTrue (fnf.ToString ().IndexOf ("''") != -1, "#B9");
 #else
index 51d352d0dd8a944b63eed2820537967feb06acad..92a3b0147ec80fe76c7f5d55969fa514889b8109 100644 (file)
@@ -706,7 +706,6 @@ namespace MonoTests.System.IO
                        }
                }
 
-#if !TARGET_JVM // No support IntPtr file handles under TARGET_JVM
                [Test, ExpectedException (typeof (IOException))]
                public void CtorIOException2 ()
                {
@@ -718,9 +717,7 @@ namespace MonoTests.System.IO
                                        stream.Close ();
                        }
                }
-#endif // TARGET_JVM
 
-               [Category("TargetJvmNotSupported")] // File sharing not supported for TARGET_JVM
                [Test, ExpectedException (typeof (IOException))]
                public void CtorIOException ()
                {
@@ -768,7 +765,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // File sharing not supported for TARGET_JVM
                [ExpectedException (typeof (IOException))]
                public void CtorAccess1Read2Write ()
                {
@@ -794,7 +790,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // File sharing not supported for TARGET_JVM
                [ExpectedException (typeof (IOException))]
                public void CtorAccess1Write2Write ()
                {
@@ -1022,7 +1017,6 @@ namespace MonoTests.System.IO
                        DeleteFile (path);
                }
 
-               [Category("TargetJvmNotSupported")] // File locking not supported for TARGET_JVM
                public void TestLock ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "TestLock";
@@ -1311,7 +1305,6 @@ namespace MonoTests.System.IO
                        }
                }
 
-#if !TARGET_JVM // No support IntPtr file handles under TARGET_JVM
                // Check that the stream is flushed even when it doesn't own the
                // handle
                [Test]
@@ -1331,7 +1324,6 @@ namespace MonoTests.System.IO
                        Assert.AreEqual ((int) '1', s.ReadByte ());
                        s.Close ();
                }
-#endif // TARGET_JVM
 
                private void DeleteFile (string path)
                {
@@ -1447,14 +1439,12 @@ namespace MonoTests.System.IO
                        }
                }
 
-#if !TARGET_JVM // No support IntPtr file handles under TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Constructor_InvalidFileHandle ()
                {
                        new FileStream ((IntPtr) (-1L), FileAccess.Read);
                }
-#endif // TARGET_JVM
 
                [Test]
                public void PositionAfterSetLength ()
@@ -1493,7 +1483,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // Async IO not supported for TARGET_JVM
                [ExpectedException (typeof (ObjectDisposedException))]
                public void BeginRead_Disposed ()
                {
@@ -1505,7 +1494,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // Async IO not supported for TARGET_JVM
                [ExpectedException (typeof (ObjectDisposedException))]
                public void BeginWrite_Disposed ()
                {
@@ -1546,7 +1534,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // File locking not supported for TARGET_JVM
                [ExpectedException (typeof (ObjectDisposedException))]
                public void Lock_Disposed ()
                {
@@ -1558,7 +1545,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // File locking not supported for TARGET_JVM
                [ExpectedException (typeof (ObjectDisposedException))]
                public void Unlock_Disposed ()
                {
@@ -1621,7 +1607,6 @@ namespace MonoTests.System.IO
                        }
                }
 
-               [Category("TargetJvmNotSupported")] // FileOptions.DeleteOnClose not supported for TARGET_JVM
                [Test]
                public void DeleteOnClose ()
                {
index 583befd172c97c3afc0a7f177fc66ea3936733f8..6fbf68be609401d5991f99a662c0315e60395ccb 100644 (file)
@@ -72,7 +72,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM
                public void CreationTimeFile ()
                {
                        if (Unix)
@@ -125,7 +124,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM
                public void CreationTimeDirectory ()
                {
                        if (Unix)
@@ -166,7 +164,6 @@ namespace MonoTests.System.IO
                }
                
                [Test]
-               [Category("TargetJvmNotSupported")] // CreationTime not supported for TARGET_JVM
                public void CreationTimeNoFileOrDirectory ()
                {
                        string path = TempFolder + DSC + "FSIT.CreationTimeNoFile.Test";
@@ -216,7 +213,6 @@ namespace MonoTests.System.IO
                }
                
                [Test]
-               [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM
                public void DefaultLastAccessTime ()
                {
                        string path = TempFolder + DSC + "FSIT.DefaultLastAccessTime.Test";
@@ -239,7 +235,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM
                public void LastAccessTime ()
                {
                        string path = TempFolder + DSC + "FSIT.LastAccessTime.Test";
@@ -282,7 +277,6 @@ namespace MonoTests.System.IO
                }
                
                [Test]
-               [Category("TargetJvmNotSupported")] // LastAccessTime not supported for TARGET_JVM
                public void DefaultLastWriteTime ()
                {
                        string path = TempFolder + DSC + "FSIT.DefaultLastWriteTime.Test";
index 84c55b48609f24f089f3bbcdb88bb53314258fed..05c2241144d8fa6363f6babfe8bc32c8ca8acc6b 100644 (file)
@@ -1107,7 +1107,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void TestGetCreationTime ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "baz";
@@ -1123,7 +1122,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void CreationTime ()
                {
                        if (RunningOnUnix)
@@ -1166,7 +1164,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void LastAccessTime ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "lastAccessTime";
@@ -1261,7 +1258,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTime_Path_Null ()
                {
                        try {
@@ -1276,7 +1272,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTime_Path_Empty ()
                {
                        try {
@@ -1292,7 +1287,6 @@ namespace MonoTests.System.IO
                }
        
                [Test]
-               //[Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTime_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeException3";
@@ -1322,7 +1316,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTime_Path_Whitespace ()
                {
                        try {
@@ -1338,7 +1331,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTime_Path_InvalidPathChars ()
                {
                        try {
@@ -1354,7 +1346,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTimeUtc_Path_Null ()
                {
                        try {
@@ -1369,7 +1360,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTimeUtc_Path_Empty ()
                {
                        try {
@@ -1385,7 +1375,6 @@ namespace MonoTests.System.IO
                }
        
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTimeUtc_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeUtcException3";
@@ -1414,7 +1403,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTimeUtc_Path_Whitespace ()
                {
                        try {
@@ -1430,7 +1418,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetCreationTime not supported for TARGET_JVM
                public void GetCreationTimeUtc_Path_InvalidPathChars ()
                {
                        try {
@@ -1446,7 +1433,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTime_Path_Null ()
                {
                        try {
@@ -1461,7 +1447,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTime_Path_Empty ()
                {
                        try {
@@ -1477,7 +1462,6 @@ namespace MonoTests.System.IO
                }
        
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTime_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeException3";
@@ -1507,7 +1491,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTime_Path_Whitespace ()
                {
                        try {
@@ -1523,7 +1506,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTime_Path_InvalidPathChars ()
                {
                        try {
@@ -1539,7 +1521,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTimeUtc_Path_Null ()
                {
                        try {
@@ -1554,7 +1535,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTimeUtc_Path_Empty ()
                {
                        try {
@@ -1570,7 +1550,6 @@ namespace MonoTests.System.IO
                }
        
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTimeUtc_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeUtcException3";
@@ -1599,7 +1578,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTimeUtc_Path_Whitespace ()
                {
                        try {
@@ -1615,7 +1593,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // GetLastAccessTime not supported for TARGET_JVM
                public void GetLastAccessTimeUtc_Path_InvalidPathChars ()
                {
                        try {
@@ -1824,7 +1801,6 @@ namespace MonoTests.System.IO
                // SetCreationTime and SetCreationTimeUtc exceptions
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_Path_Null ()
                {
                        try {
@@ -1839,7 +1815,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_Path_Empty ()
                {
                        try {
@@ -1855,7 +1830,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_Path_Whitespace ()
                {
                        try {
@@ -1871,7 +1845,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_Path_InvalidPathChars ()
                {
                        // On Unix there are no invalid path chars.
@@ -1891,7 +1864,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetCreationTimeFileNotFoundException1";
@@ -1927,7 +1899,6 @@ namespace MonoTests.System.IO
 //             }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTime_FileLock ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "CreationTimeIOException1";
@@ -1954,7 +1925,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_Path_Null ()
                { 
                        try {
@@ -1969,7 +1939,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_Path_Empty ()
                {
                        try {
@@ -1985,7 +1954,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_Path_Whitespace ()
                {
                        try {
@@ -2001,7 +1969,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_Path_InvalidPathChars ()
                {
                        // On Unix there are no invalid path chars.
@@ -2021,7 +1988,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetCreationTimeUtcFileNotFoundException1";
@@ -2057,7 +2023,6 @@ namespace MonoTests.System.IO
 //             }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetCreationTime not supported for TARGET_JVM
                public void SetCreationTimeUtc_FileLock ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetCreationTimeUtcIOException1";
@@ -2086,7 +2051,6 @@ namespace MonoTests.System.IO
                // SetLastAccessTime and SetLastAccessTimeUtc exceptions
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_Path_Null ()
                {
                        try {
@@ -2101,7 +2065,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_Path_Empty ()
                {
                        try {
@@ -2117,7 +2080,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_Path_Whitespace ()
                {
                        try {
@@ -2133,7 +2095,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_Path_InvalidPathChars ()
                {
                        // On Unix there are no invalid path chars.
@@ -2153,7 +2114,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetLastAccessTimeFileNotFoundException1";
@@ -2189,7 +2149,6 @@ namespace MonoTests.System.IO
 //             }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTime_FileLock ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "LastAccessIOException1";
@@ -2216,7 +2175,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTimeUtc_Path_Null ()
                {
                        try {
@@ -2231,7 +2189,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetCLastAccessTimeUtc_Path_Empty ()
                {
                        try {
@@ -2247,7 +2204,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTimeUtc_Path_Whitespace ()
                {
                        try {
@@ -2263,7 +2219,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTimeUtc_Path_InvalidPathChars ()
                {
                        // On Unix there are no invalid path chars.
@@ -2283,7 +2238,6 @@ namespace MonoTests.System.IO
                }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTimeUtc_Path_DoesNotExist ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetLastAccessTimeUtcFileNotFoundException1";
@@ -2319,7 +2273,6 @@ namespace MonoTests.System.IO
 //             }
 
                [Test]
-               [Category("TargetJvmNotSupported")] // SetLastAccessTime not supported for TARGET_JVM
                public void SetLastAccessTimeUtc_FileLock ()
                {
                        string path = TempFolder + Path.DirectorySeparatorChar + "SetLastAccessTimeUtcIOException1";
index d0314abe63f450ba02b475f58eba6f6b42b48725..2cc048a701fe0d12024d2a3d464c281bc15141d6 100644 (file)
@@ -765,9 +765,7 @@ namespace MonoTests.System.IO
                {
                        if (Windows) {
                                Assert.AreEqual (@"Z:\", Path.GetFullPath ("Z:"), "GetFullPath w#01");
-#if !TARGET_JVM // Java full (canonical) path always starts with caps drive letter
                                Assert.AreEqual (@"c:\abc\def", Path.GetFullPath (@"c:\abc\def"), "GetFullPath w#02");
-#endif
                                Assert.IsTrue (Path.GetFullPath (@"\").EndsWith (@"\"), "GetFullPath w#03");
                                // "\\\\" is not allowed
                                Assert.IsTrue (Path.GetFullPath ("/").EndsWith (@"\"), "GetFullPath w#05");
@@ -1037,11 +1035,7 @@ namespace MonoTests.System.IO
 
                        string curdir = Directory.GetCurrentDirectory ();
                        try {
-#if TARGET_JVM
-                               string system = "C:\\WINDOWS\\system32\\";
-#else
                                string system = Environment.SystemDirectory;
-#endif
                                Directory.SetCurrentDirectory (system);
                                string drive = system.Substring (0, 2);
                                Assert.AreEqual (system, Path.GetFullPath (drive), "current dir");
@@ -1062,11 +1056,7 @@ namespace MonoTests.System.IO
 
                        string curdir = Directory.GetCurrentDirectory ();
                        try {
-#if TARGET_JVM
-                               string system = "C:\\WINDOWS\\system32\\";
-#else
                                string system = Environment.SystemDirectory;
-#endif
                                Directory.SetCurrentDirectory (system);
                                // e.g. C:dir (no backslash) will return CurrentDirectory + dir
                                string dir = system.Substring (0, 2) + "dir";
@@ -1078,9 +1068,6 @@ namespace MonoTests.System.IO
                }
 #endif
                [Test]
-#if TARGET_JVM
-               [Ignore("Java full (canonical) path always returns windows dir in caps")]
-#endif
                public void WindowsDriveC14N_77058 ()
                {
                        // check for Unix platforms - see FAQ for more details
index 5805df02cb5fbfb9c8ac621fb9382442a2d58b24..8d1b9887528f24a240da36abb6cc625f56b23f3b 100644 (file)
@@ -10,7 +10,7 @@
 // Copyright (C) 2004, 2009 Novell (http://www.novell.com)
 //
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 using System;
 using System.Collections;
 using System.IO;
index ae086137d5a0d5f89ba151be1d902d0ff6d564df..28b2a8b36ef936c10a9dd981f79cc55c2e2a0398 100644 (file)
@@ -13,7 +13,7 @@ using System;
 using System.Configuration.Assemblies;
 using System.IO;
 using System.Reflection;
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
 using System.Reflection.Emit;
 #endif
 using System.Runtime.Serialization;
@@ -31,9 +31,7 @@ public class AssemblyNameTest {
 
        private string tempDir = Path.Combine (Path.GetTempPath (), "MonoTests.System.Reflection.AssemblyNameTest");
 
-#if !TARGET_JVM // Thread.GetDomain is not supported for TARGET_JVM.
        private AppDomain domain;
-#endif // TARGET_JVM
 
        // created with "sn -o test.snk test.txt"
        static byte[] keyPair = {
@@ -154,9 +152,7 @@ public class AssemblyNameTest {
 
                Directory.CreateDirectory (tempDir);
 
-#if !TARGET_JVM // Thread.GetDomain is not supported for TARGET_JVM.
                domain = Thread.GetDomain ();
-#endif // TARGET_JVM
        }
 
        [TearDown]
@@ -761,7 +757,7 @@ public class AssemblyNameTest {
                return assemblyName;
        }
 
-#if !TARGET_JVM && !MOBILE // Reflection.Emit is not supported for TARGET_JVM.
+#if !MOBILE
        private Assembly GenerateAssembly (AssemblyName name) 
        {
                AssemblyBuilder ab = domain.DefineDynamicAssembly (
@@ -892,7 +888,7 @@ public class AssemblyNameTest {
                ab = GenerateDynamicAssembly (name);
                Assert.AreEqual ("1.2.0.0", ab.GetName ().Version.ToString (), "1.2.0.0 dynamic");
        }
-#endif // TARGET_JVM
+#endif
 
        [Test]
        public void HashAlgorithm ()
@@ -983,7 +979,6 @@ public class AssemblyNameTest {
                Assert.AreEqual (an.GetPublicKeyToken (), dsAssemblyName.GetPublicKeyToken (), "PublicToken");
        }
 
-#if !TARGET_JVM // Assemblyname.GetObjectData not implemented yet for TARGET_JVM
        [Test]
        public void GetObjectData_Info_Null ()
        {
@@ -999,7 +994,6 @@ public class AssemblyNameTest {
                        Assert.AreEqual ("info", ex.ParamName, "#6");
                }
        }
-#endif // TARGET_JVM
 
        [Test]
        public void Clone_Corlib ()
@@ -1166,7 +1160,6 @@ public class AssemblyNameTest {
        }
 
        [Test] // ctor (String)
-       [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM.
        public void Constructor1_Full ()
        {
                const string assemblyName = "TestAssembly";
@@ -1768,7 +1761,6 @@ public class AssemblyNameTest {
        }
 
        [Test] // ctor (String)
-       [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM.
        public void Constructor1_Version ()
        {
                const string assemblyName = "TestAssembly";
index 088deb72c03e117383798adcf1e7c97b7e219a1e..8ff6609536329608b2235897380ea6e9d49bd4fc 100644 (file)
@@ -35,7 +35,7 @@ using System.Configuration.Assemblies;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-#if !TARGET_JVM && !MONOTOUCH
+#if !MONOTOUCH
 using System.Reflection.Emit;
 #endif
 using System.Threading;
@@ -141,18 +141,18 @@ namespace MonoTests.System.Reflection
                        string fname = AppDomain.CurrentDomain.FriendlyName;
                        if (fname.EndsWith (".dll")) { // nunit-console
                                Assert.IsNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
-#if NET_2_0 && !TARGET_JVM // IsDefaultAppDomain not supported for TARGET_JVM
+#if NET_2_0
                                Assert.IsFalse (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
 #endif
                        } else { // gnunit
                                Assert.IsNotNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
-#if NET_2_0 && !TARGET_JVM // IsDefaultAppDomain not supported for TARGET_JVM
+#if NET_2_0
                                Assert.IsTrue (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
 #endif
                        }
                }
 
-#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit is not supported.
+#if !MONOTOUCH // Reflection.Emit is not supported.
                [Test]
                public void GetModules_MissingFile ()
                {
@@ -177,7 +177,6 @@ namespace MonoTests.System.Reflection
                }
 #endif
 
-#if !TARGET_JVM // ManifestModule not supported under TARGET_JVM.
                [Category ("NotWorking")]
                [Test]
                public void Corlib () 
@@ -224,7 +223,6 @@ namespace MonoTests.System.Reflection
                        Assert.IsNotNull (corlib_test.ManifestModule, "ManifestModule");
                        Assert.IsFalse (corlib_test.ReflectionOnly, "ReflectionOnly");
                }
-#endif
 
                [Test]
                public void GetAssembly ()
@@ -234,7 +232,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-               [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
                public void GetFile_Null ()
                {
                        try {
@@ -249,7 +246,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-               [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
                public void GetFile_Empty ()
                {
                        try {
@@ -265,7 +261,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-               [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
                public void GetFiles_False ()
                {
                        Assembly corlib = typeof (int).Assembly;
@@ -278,7 +273,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-               [Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
                public void GetFiles_True ()
                {
                        Assembly corlib = typeof (int).Assembly;
@@ -427,7 +421,6 @@ namespace MonoTests.System.Reflection
                        Assert.Fail ("Was not able to load any corlib test");
                }
 
-#if !TARGET_JVM // GetObjectData currently not implemented for Assembly.
                [Test]
                public void GetObjectData_Info_Null ()
                {
@@ -444,7 +437,6 @@ namespace MonoTests.System.Reflection
                                Assert.AreEqual ("info", ex.ParamName, "#6");
                        }
                }
-#endif // TARGET_JVM
 
                [Test]
                public void GetReferencedAssemblies ()
@@ -466,7 +458,7 @@ namespace MonoTests.System.Reflection
                        }
                }
 
-#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit is not supported.
+#if !MONOTOUCH // Reflection.Emit is not supported.
                [Test]
                public void Location_Empty() {
                        string assemblyFileName = Path.Combine (
@@ -1085,7 +1077,7 @@ namespace MonoTests.System.Reflection
 
                        Directory.Delete (outdir, true);
                }
-#endif // TARGET_JVM
+#endif
 
                [Test]
                public void ManifestModule ()
index cd49ced74fd50e56247582b394f139863b07cd60..ccd923fa59c7517cbb2a74f803e8d769d37d02a3 100644 (file)
@@ -31,9 +31,9 @@
 using System;
 using System.Threading;
 using System.Reflection;
-#if !TARGET_JVM && !MONOTOUCH
+#if !MONOTOUCH
 using System.Reflection.Emit;
-#endif // TARGET_JVM
+#endif
 using System.Runtime.InteropServices;
 
 using NUnit.Framework;
@@ -397,7 +397,6 @@ namespace MonoTests.System.Reflection
                        typeof (Foo).GetField ("static_field").GetValue (typeof (int));
                }
 
-#if !TARGET_JVM // ReflectionOnlyLoad not supported for TARGET_JVM
                [Test]
                [ExpectedException (typeof (InvalidOperationException))]
                public void GetValueOnRefOnlyAssembly ()
@@ -417,7 +416,6 @@ namespace MonoTests.System.Reflection
                        FieldInfo f = t.GetField ("RefOnlyField", BindingFlags.Static | BindingFlags.NonPublic);
                        f.SetValue (null, 8);
                }
-#endif // TARGET_JVM
 
                const int literal = 42;
 
@@ -453,7 +451,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (null, fi2.GetValue (t));
                }
        
-#if !TARGET_JVM // TypeBuilder not supported for TARGET_JVM
                [Test]
                public void NonPublicTests ()
                {
@@ -468,7 +465,6 @@ namespace MonoTests.System.Reflection
                        fi = t.GetField ("protectedField", BindingFlags.NonPublic | BindingFlags.Instance);
                        Assert.IsNotNull (fi);
                }
-#endif // TARGET_JVM
 
                [Test]
                public void GetRawDefaultValue ()
index eabe77e48e5a10ca0774747cefa503236a330793..65adf97aa51cb3fae0efc2b5d6374e45d5ebb2f2 100644 (file)
@@ -51,10 +51,8 @@ namespace MonoTests.System.Reflection
        [TestFixture]
        public class MethodInfoTest
        {
-#if !TARGET_JVM
                [DllImport ("libfoo", EntryPoint="foo", CharSet=CharSet.Unicode, ExactSpelling=false, PreserveSig=true, SetLastError=true, BestFitMapping=true, ThrowOnUnmappableChar=true)]
                public static extern void dllImportMethod ();
-#endif
                [MethodImplAttribute(MethodImplOptions.PreserveSig)]
                public void preserveSigMethod ()
                {
@@ -128,7 +126,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ReturnTypePseudoCustomAttributes ()
                {
                        MethodInfo mi = typeof (MethodInfoTest).GetMethod ("ReturnTypeMarshalAs");
@@ -317,7 +314,6 @@ namespace MonoTests.System.Reflection
                }
 
 #if NET_2_0
-#if !TARGET_JVM // MethodBody is not supported for TARGET_JVM
                [Test]
                public void GetMethodBody_Abstract ()
                {
@@ -382,7 +378,6 @@ namespace MonoTests.System.Reflection
                        else
                                Assert.AreEqual (false, locals [1].IsPinned, "#6");
                }
-#endif // TARGET_JVM
 
                public int return_parameter_test ()
                {
@@ -413,7 +408,6 @@ namespace MonoTests.System.Reflection
                        //Assert.IsTrue (pi.IsRetval, "#3");
                }
 
-#if !TARGET_JVM // ReflectionOnly is not supported yet on TARGET_JVM
                [Test]
                        public void InvokeOnRefOnlyAssembly ()
                {
@@ -431,7 +425,6 @@ namespace MonoTests.System.Reflection
                                Assert.IsNotNull (ex.Message, "#4");
                        }
                }
-#endif // TARGET_JVM
 
                [Test]
                [ExpectedException (typeof (TargetInvocationException))]
index b22f46f36507cf03144467ebacdb9adedc85f3be..c0a6e39bcdb9788febcf601ed4a7420b38a0d63c 100644 (file)
@@ -83,13 +83,11 @@ namespace MonoTests.System.Reflection
                {
                }
 
-#if !TARGET_JVM // No support for extern methods in TARGET_JVM
                [DllImport ("foo")]
                public extern static void marshalAsMethod (
                        [MarshalAs(UnmanagedType.Bool)]int p0, 
                        [MarshalAs(UnmanagedType.LPArray, ArraySubType=UnmanagedType.LPStr)] string [] p1,
                        [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof (Marshal1), MarshalCookie = "5")] object p2);
-#endif
                [Test]
                public void DefaultValueEnum () {
                        ParameterInfo[] info = typeof (ParameterInfoTest).GetMethod ("paramMethod").GetParameters ();
@@ -151,7 +149,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (1, info[3].GetCustomAttributes (typeof (OptionalAttribute), true).Length, "#A4");
                        Assert.AreEqual (2, info[4].GetCustomAttributes (true).Length, "#A5");
 
-#if !TARGET_JVM // No support for extern methods in TARGET_JVM
                        ParameterInfo[] pi = typeof (ParameterInfoTest).GetMethod ("marshalAsMethod").GetParameters ();
                        MarshalAsAttribute attr;
 
@@ -166,7 +163,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (UnmanagedType.CustomMarshaler, attr.Value, "#D1");
                        Assert.AreEqual ("5", attr.MarshalCookie, "#D2");
                        Assert.AreEqual (typeof (Marshal1), Type.GetType (attr.MarshalType), "#D3");
-#endif
                }
 
                [Test] // bug #342536
index 56ce9c53f50fa2b455bdb37234729a146e606ccb..c1fc39a59c3c62e2b41dc963f7c7d9ec82596bbd 100644 (file)
@@ -28,9 +28,9 @@
 using System;
 using System.Threading;
 using System.Reflection;
-#if !TARGET_JVM && !MONOTOUCH
+#if !MONOTOUCH
 using System.Reflection.Emit;
-#endif // TARGET_JVM
+#endif
 
 using NUnit.Framework;
 
index 259361854b9b85299b3d4d780c1d79010002287b..d6f2a49bf38d774f3ee0f8be8c7a3f1f2f37c685 100644 (file)
@@ -7,7 +7,6 @@
 //
 // Copyright (C) 2004-2007 Novell, Inc (http://www.novell.com)
 //
-#if !TARGET_JVM
 using NUnit.Framework;
 using System;
 using System.IO;
@@ -878,4 +877,3 @@ namespace MonoTests.System.Runtime.InteropServices
        }
 #endif
 }
-#endif
index d0b31f1a8a85acff882023b59c82f55ebb3ba638..ba69ed0503ba2cef85676b6de18327fdc590a987 100644 (file)
@@ -107,11 +107,7 @@ namespace MonoTests.System.Runtime.Remoting.Contexts {
                public void DeserializeKnownValue ()
                {
                        MemoryStream ms = new MemoryStream (serialized_sync_attr);
-#if TARGET_JVM
-                       BinaryFormatter bf = (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-#else
                        BinaryFormatter bf = new BinaryFormatter ();
-#endif // TARGET_JVM
                        SynchronizationAttribute sa = (SynchronizationAttribute) bf.Deserialize (ms);
                        Assert.IsTrue (sa.IsReEntrant, "IsReEntrant");
                        Assert.IsFalse (sa.Locked, "Locked");
index 304ddb6bcafd218f57d8b51b838074e69235dcf1..59998c37221f8b4f264593a77f0bb3ef8f21f2b5 100644 (file)
@@ -8,7 +8,6 @@
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 // Copyright 2011 Xamarin Inc (http://www.xamarin.com).
 //
-#if !TARGET_JVM
 using NUnit.Framework;
 
 using System;
@@ -175,4 +174,3 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
                }
        }
 }
-#endif
index 3da3fe6276e9a1873c33aeb48e354bed424ba392..4890c1a20838be6bfe640e1097c056cea1f7da46 100644 (file)
@@ -148,7 +148,6 @@ public class CryptoConfigTest {
                CreateFromName ("http://www.w3.org/2000/09/xmldsig#hmac-sha1", null);
                // URL used in DigestMethod element 
                CreateFromName ("http://www.w3.org/2000/09/xmldsig#sha1", "System.Security.Cryptography.SHA1CryptoServiceProvider");
-#if !TARGET_JVM //TargetJvmNotWorking - algorithms from System.Security assembly
                // URL used in Canonicalization or Transform elements 
                CreateFromName ("http://www.w3.org/TR/2001/REC-xml-c14n-20010315", "System.Security.Cryptography.Xml.XmlDsigC14NTransform");
                CreateFromName ("http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments", "System.Security.Cryptography.Xml.XmlDsigC14NWithCommentsTransform");
@@ -178,7 +177,6 @@ public class CryptoConfigTest {
                CreateFromName ("http://www.w3.org/2001/04/xmldsig-more#hmac-sha384", "System.Security.Cryptography.HMACSHA384");
                CreateFromName ("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", "System.Security.Cryptography.HMACSHA512");
                CreateFromName ("http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160", "System.Security.Cryptography.HMACRIPEMD160");
-#endif
 #endif
        }
 
index 727b13cdaa00cd184e3574beee86c0eadd18bebf..18e26afb2972a0faae2f3b170611f2c892e05579 100644 (file)
@@ -112,7 +112,6 @@ public class DSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void ConstructorCspParameters () 
        {
                CspParameters csp = new CspParameters (13, null, "Mono1024");
@@ -125,7 +124,6 @@ public class DSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void ConstructorKeySizeCspParameters () 
        {
                CspParameters csp = new CspParameters (13, null, "Mono512");
@@ -733,7 +731,6 @@ public class DSACryptoServiceProviderTest {
        //      http://msdn.microsoft.com/library/en-us/cpguide/html/cpcongeneratingkeysforencryptiondecryption.asp
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_False () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_PersistKeyInCsp_False");
@@ -758,7 +755,6 @@ public class DSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_True () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_PersistKeyInCsp_True");
@@ -779,7 +775,6 @@ public class DSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_Delete () 
        {
                CspParameters csp = new CspParameters (3, null, "Persistence_Delete");
@@ -836,7 +831,6 @@ public class DSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void UseMachineKeyStore () 
        {
                // note only applicable when CspParameters isn't used - which don't
index 01a3f9987f326267418e82808d60475c42c94c2b..6cf1637d0859b55ce42067cf2461f13511c31f30 100644 (file)
@@ -111,7 +111,6 @@ public class RSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void ConstructorCspParameters ()
        {
                CspParameters csp = new CspParameters (1, null, "Mono1024");
@@ -126,7 +125,6 @@ public class RSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void ConstructorKeySizeCspParameters ()
        {
                int keySize = 512;
@@ -1001,7 +999,6 @@ public class RSACryptoServiceProviderTest {
        //      http://msdn.microsoft.com/library/en-us/cpguide/html/cpcongeneratingkeysforencryptiondecryption.asp
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_False () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_PersistKeyInCsp_False");
@@ -1026,7 +1023,6 @@ public class RSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_PersistKeyInCsp_True () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_PersistKeyInCsp_True");
@@ -1047,7 +1043,6 @@ public class RSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void Persistence_Delete () 
        {
                CspParameters csp = new CspParameters (1, null, "Persistence_Delete");
@@ -1076,7 +1071,6 @@ public class RSACryptoServiceProviderTest {
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")]
        public void UseMachineKeyStore () 
        {
                // note only applicable when CspParameters isn't used - which don't
index c41aad0505add447a2c29b6625c6ec255fd9835c..062b0333a2774853e8a138f875b75636acd64bb8 100644 (file)
@@ -20,7 +20,6 @@ using System.Text;
 using NUnit.Framework;
 
 namespace MonoTests.System.Security.Permissions {
-#if !TARGET_JVM
        public class FilePathUtil {
                [DllImport("kernel32.dll")]
                private static extern uint GetLongPathName (string shortPath, 
@@ -48,7 +47,6 @@ namespace MonoTests.System.Security.Permissions {
                                return null;
                }
        }
-#endif
 
        [TestFixture]
        public class FileIOPermissionTest {
@@ -428,7 +426,6 @@ namespace MonoTests.System.Security.Permissions {
                        pathsInPermission = read.Split(';');
                        Assert.IsTrue(pathsInPermission.Length == 2, "Path list should have 2 for Read");
                }
-#if !TARGET_JVM
                [Test]
                [Ignore("should compatibility go that far ?")]
                public void ShortToLong () 
@@ -443,7 +440,6 @@ namespace MonoTests.System.Security.Permissions {
                        // note: this will fail on Linux as kernel32.dll isn't available
                        Assert.AreEqual (FilePathUtil.GetLongPathName (filename), files [0], "GetLongPathName(GetTempFileName)==GetPathList[0]");
                }
-#endif
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void FileUrl ()
index eb454d7c64ecb355c45df33a37c4bbdb991f06dd..29103621206695ffc54c8383b4d3adfbef81168d 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 
 using NUnit.Framework;
 using System;
index d1b99d5a723122420917a94c8025bc2d0238a312..ab45c90881ace0b749d481fb9fcabf84832888e6 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 
 using NUnit.Framework;
 using System;
index 0e5dbded301543186b7901747b01e51b64f6d6d9..501346f0712911c0e46c1d1117e4b96099d56f04 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 
 using NUnit.Framework;
 using System;
index 5752be0de83c82346f6be57eeea3a91d876fa69e..3f35de5c6ce4b5e7d0f27920f2b0951b3d5a9304 100644 (file)
@@ -58,9 +58,7 @@ namespace MonoCasTests.System.Security {
                        try {
                                SecureStringTest unit = new SecureStringTest ();
                                unit.DefaultConstructor ();
-#if !TARGET_JVM
                                unit.UnsafeConstructor ();
-#endif
                                unit.ReadOnly ();
                                unit.Disposed ();
                        }
index 87144d3da4820d17cc5af73eaed58f27e46cbcfb..976628af257ec5276c8ebfd3549b50ecd8cbac6d 100644 (file)
@@ -65,7 +65,6 @@ namespace MonoTests.System.Security {
                                Assert.Ignore (NotSupported);
                        }
                }
-#if !TARGET_JVM
                [Test]
                public unsafe void UnsafeConstructor ()
                {
@@ -143,7 +142,6 @@ namespace MonoTests.System.Security {
                        SecureString ss = GetMaxLength ();
                        ss.AppendChar ('a');
                }
-#endif
                [Test]
                public void Copy_Empty ()
                {
@@ -253,7 +251,6 @@ namespace MonoTests.System.Security {
                        SecureString ss = new SecureString ();
                        ss.RemoveAt (1);
                }
-#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentOutOfRangeException))]
                public void InsertAt_BiggerThanMax ()
@@ -261,7 +258,6 @@ namespace MonoTests.System.Security {
                        SecureString ss = GetMaxLength ();
                        ss.InsertAt (ss.Length, 'a');
                }
-#endif
                private SecureString GetReadOnly ()
                {
                        SecureString ss = new SecureString ();
index 08d14bec59858267ee60972fdcab52ec9e9e4da5..5d68a7d0e2a0dce1edf6f36d9141a4629acd9e18 100644 (file)
@@ -38,11 +38,9 @@ namespace MonoTests.System.Threading
                readonly object obj_1 = "obj_1";
                readonly object obj_2 = "obj_2";
                readonly object obj_3 = "obj_3";
-#if !TARGET_JVM // No support for exchanging two IntPtrs
                readonly IntPtr iptr_1 = (IntPtr)int32_1;
                readonly IntPtr iptr_2 = (IntPtr)int32_2;
                readonly IntPtr iptr_3 = (IntPtr)int32_3;
-#endif // TARGET_JVM
 
                [Test]
                public void TestExchange_Int32 ()
@@ -85,7 +83,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(dbl_2, dbl);
                }
 
-#if !TARGET_JVM // No support for exchanging two IntPtrs
                [Test]
                public void TestExchange_Iptr ()
                {
@@ -93,7 +90,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(iptr_1, Interlocked.Exchange(ref iptr, iptr_2));
                        Assert.AreEqual(iptr_2, iptr);
                }
-#endif // TARGET_JVM
 #endif
 
                [Test]
@@ -137,7 +133,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(dbl_2, dbl);
                }
 
-#if !TARGET_JVM // No support for compare exchanging two IntPtrs
                [Test]
                public void TestCompareExchange_Iptr ()
                {
@@ -145,7 +140,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(iptr_1, Interlocked.CompareExchange(ref iptr, iptr_2, iptr_1));
                        Assert.AreEqual(iptr_2, iptr);
                }
-#endif // TARGET_JVM
 #endif
 
                [Test]
@@ -189,7 +183,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(dbl_1, dbl);
                }
 
-#if !TARGET_JVM // No support for compare exchanging two IntPtrs
                [Test]
                public void TestCompareExchange_Failed_Iptr ()
                {
@@ -197,7 +190,6 @@ namespace MonoTests.System.Threading
                        Assert.AreEqual(iptr_1, Interlocked.CompareExchange(ref iptr, iptr_2, iptr_3));
                        Assert.AreEqual(iptr_1, iptr);
                }
-#endif // TARGET_JVM
 #endif
 
                [Test]
index 64aeed5d944734f8a614ea89719eaa225c4f9221..a4669029b8882302d67cc2953ce2e7eee89677c3 100644 (file)
@@ -156,7 +156,6 @@ namespace MonoTests.System.Threading
                }\r
 \r
                [Test]\r
-               [Category("TargetJvmNotSupported")] // IntPtr native handles are not supported for TARGET_JVM.\r
                public void TestHandle()\r
                {\r
                        Mutex Sem = new Mutex();\r
index ca5489ef0d876de3cb5437c79c6bdd184f807e71..8c82931acc57fba450bead9ffc2953adab6b20b6 100644 (file)
@@ -25,9 +25,7 @@ namespace MonoTests.System.Threading
        {
                public static void NoPrincipal () 
                {
-#if !TARGET_JVM // AppDomain.SetPrincipalPolicy not supported for TARGET_JVM
                        AppDomain.CurrentDomain.SetPrincipalPolicy (PrincipalPolicy.NoPrincipal);
-#endif
                        IPrincipal p = Thread.CurrentPrincipal;
                        Assert.IsNull (p, "#1");
 
@@ -39,7 +37,6 @@ namespace MonoTests.System.Threading
                        // in this case we can return to null
                }
 
-#if !TARGET_JVM // AppDomain.SetPrincipalPolicy not supported for TARGET_JVM
                public static void UnauthenticatedPrincipal () 
                {
                        AppDomain.CurrentDomain.SetPrincipalPolicy (PrincipalPolicy.UnauthenticatedPrincipal);
@@ -76,7 +73,6 @@ namespace MonoTests.System.Threading
                        Assert.IsNotNull (Thread.CurrentPrincipal, "#7");
                        // in this case we can't return to null
                }
-#endif // TARGET_JVM
 
                public static void CopyOnNewThread ()
                {
@@ -684,7 +680,6 @@ namespace MonoTests.System.Threading
                        }
                }
 
-#if !TARGET_JVM // AppDomain.SetPrincipalPolicy not supported for TARGET_JVM
                [Test]
                [Ignore ("see comment below.")]
                public void CurrentPrincipal_PrincipalPolicy_UnauthenticatedPrincipal () 
@@ -713,7 +708,6 @@ namespace MonoTests.System.Threading
                                t.Abort ();
                        }
                }
-#endif // TARGET_JVM
                
                [Test]
                public void IPrincipal_CopyOnNewThread () 
index 1b8108743221be2673c301b7e778b4c3a1a07f9c..f7fc07e9868264be21053a6a30e36712e3931d4b 100644 (file)
@@ -13,7 +13,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit not supported for TARGET_JVM
+#if !MONOTOUCH
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
@@ -311,7 +311,7 @@ namespace MonoTests.System {
                        Assert.AreEqual (7, objCOMTest.Id, "#A05");
                }
 
-#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit not supported for TARGET_JVM
+#if !MONOTOUCH
                [Test]
                [ExpectedException (typeof (MissingMethodException))]
                public void CreateInstance_TypeBuilder ()
@@ -334,7 +334,7 @@ namespace MonoTests.System {
                {
                        Activator.CreateInstance (typeof (ArgIterator), null);
                }
-#endif // TARGET_JVM
+#endif
 
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
@@ -343,14 +343,12 @@ namespace MonoTests.System {
                        Activator.CreateInstance (typeof (void), null);
                }
 
-#if !TARGET_JVM // RuntimeArgumentHandle not supported for TARGET_JVM
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
                public void CreateInstance_RuntimeArgumentHandle ()
                {
                        Activator.CreateInstance (typeof (RuntimeArgumentHandle), null);
                }
-#endif // TARGET_JVM
 
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
@@ -370,7 +368,6 @@ namespace MonoTests.System {
 
                [Test]
                [ExpectedException(typeof(MissingMethodException))]
-               [Category ("TargetJvmNotWorking")]
                public void CreateInstanceAbstract2 () 
                {
                        Activator.CreateInstance (typeof (Type), true);
@@ -392,14 +389,12 @@ namespace MonoTests.System {
 
                [Test]
                [ExpectedException (typeof (MissingMethodException))]
-               [Category ("TargetJvmNotWorking")]
                public void CreateInstanceAbstract5 () 
                {
                        Activator.CreateInstance (typeof (Type), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, null, CultureInfo.InvariantCulture, null);
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void CreateInstance_Nullable ()
                {
                        Assert.AreEqual (5, Activator.CreateInstance (typeof (Nullable<int>), new object [] { 5 }));
@@ -419,7 +414,6 @@ namespace MonoTests.System {
 #if !MOBILE
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
-               [Category ("TargetJvmNotWorking")]
                public void GetObject_UrlNull ()
                {
                        Activator.GetObject (typeof (COMTest), null);
@@ -477,7 +471,6 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [Category ("TargetJvmNotSupported")] // No support under TARGET_JVM for assemlies versioning
                public void Unification_FromFx10 ()
                {
                        Unification (String.Format (CorlibPermissionPattern, fx10version));
@@ -485,7 +478,6 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [Category ("TargetJvmNotSupported")] // No support under TARGET_JVM for assemlies versioning
                public void Unification_FromFx11 ()
                {
                        Unification (String.Format (CorlibPermissionPattern, fx11version));
@@ -493,7 +485,6 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [Category ("TargetJvmNotSupported")] // No support under TARGET_JVM for assemlies versioning
                public void Unification_FromFx20 ()
                {
                        Unification (String.Format (CorlibPermissionPattern, fx20version));
@@ -501,14 +492,12 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [Category ("TargetJvmNotSupported")] // No support under TARGET_JVM for assemlies versioning
                public void Unification_FromFx99_Corlib ()
                {
                        Unification (String.Format (CorlibPermissionPattern, "9.99.999.9999"));
                }
 
                [Test]
-               [Category ("TargetJvmNotSupported")] // No support under TARGET_JVM for assemlies versioning
                [Category ("NotWorking")]
                public void Unification_FromFx99_System ()
                {
index c0b5ed77edab6dbf7a722f0fd0d1def6e6f00d85..2e4b6e59a834022f2675183428d671ee5329e4eb 100644 (file)
@@ -29,7 +29,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ConfigurationFile_Relative_ApplicationBase ()
                {
                        string fileName = "blar.config";
@@ -51,7 +50,6 @@ namespace MonoTests.System
 
                [Test]
                [ExpectedException (typeof (MemberAccessException))] // The ApplicationBase must be set before retrieving this property
-               [Category ("TargetJvmNotWorking")]
                public void ConfigurationFile_Relative_NoApplicationBase ()
                {
                        AppDomainSetup setup = new AppDomainSetup();
@@ -72,7 +70,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase1 ()
                {
                        string expected_path = tmpPath.Replace(@"\", @"/");
@@ -96,7 +93,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase2 ()
                {
                        AppDomainSetup setup = new AppDomainSetup ();
@@ -105,7 +101,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase3 ()
                {
                        AppDomainSetup setup = new AppDomainSetup ();
@@ -115,7 +110,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase4 ()
                {
                        AppDomainSetup setup = new AppDomainSetup ();
@@ -134,7 +128,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase5 ()
                {
                        // This is failing because of (probably) a windows-ism, so don't worry
@@ -154,7 +147,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void ApplicationBase6 ()
                {
                        AppDomainSetup setup = new AppDomainSetup ();
index eab4c40e1434ad47d8c4fb335497cb760a647a24..fbea6549dc9041e1a42486dc3ea3444f42719e81 100644 (file)
@@ -543,11 +543,6 @@ public class ArrayTest
                        } catch (ArgumentException) {
                                errorThrown = true;
                        }
-#if TARGET_JVM // This is really implementation dependent behaviour.
-                       catch (RankException) {
-                               errorThrown = true;
-                       }
-#endif // TARGET_JVM
                        Assert.IsTrue (errorThrown, "#E62");
                }
                {
@@ -707,7 +702,6 @@ public class ArrayTest
                        }
                        Assert.IsTrue (errorThrown, "#F03b");
                }
-#if !TARGET_JVM // Arrays lower bounds are not supported for TARGET_JVM
                {
                        bool errorThrown = false;
                        try {
@@ -717,7 +711,6 @@ public class ArrayTest
                        }
                        Assert.IsTrue (errorThrown, "#F04");
                }
-#endif // TARGET_JVM
                {
                        bool errorThrown = false;
                        try {
@@ -728,7 +721,6 @@ public class ArrayTest
                        }
                        Assert.IsTrue (errorThrown, "#F05");
                }
-#if !TARGET_JVM // CreateInstance with lower bounds not supported for TARGET_JVM
                {
                        bool errorThrown = false;
                        try {
@@ -771,7 +763,6 @@ public class ArrayTest
                Type szarrayType = new int [10].GetType ();
                Assert.IsTrue (szarrayType == (Array.CreateInstance (typeof (int), new int[] {1}, new int[] {0})).GetType ());
                Assert.IsTrue (szarrayType != (Array.CreateInstance (typeof (int), new int[] {1}, new int[] {1})).GetType ());
-#endif // TARGET_JVM
        }
        
        [Test]
@@ -842,7 +833,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestGetEnumeratorNonZeroLowerBounds() {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -871,7 +861,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_Add () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -892,7 +881,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_Insert () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -913,7 +901,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_Remove () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -934,7 +921,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_RemoveAt () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -955,7 +941,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_Contains () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -981,7 +966,6 @@ public class ArrayTest
        }
 
        [Test]
-       [Category ("TargetJvmNotSupported")] // Arrays lower bounds are not supported for TARGET_JVM
        public void TestIList_IndexOf () {
                int[] myLengthsArray = new int[2] { 3, 5 };
                int[] myBoundsArray = new int[2] { 2, 3 };
@@ -3178,7 +3162,6 @@ public class ArrayTest
                public int i, j;
        }
 
-#if !TARGET_JVM // BugBUG: T[] is not yet ICollection<T> under TARGET_JVM
        [Test]
        // From bug #80563
        public void ICollectionNull ()
@@ -3234,7 +3217,6 @@ public class ArrayTest
                Assert.AreEqual (-1, test.IndexOf (null), "array with test");
        }
        
-#endif // TARGET_JVM
 
        #region Bug 80299
 
index 66eb43aebbb69e450873d9d1fb70afd2dbe2af6e..0c3cadf6755ca25435ab9880061ff657d9bfe83d 100644 (file)
@@ -64,12 +64,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#4");
                        Assert.AreEqual ("message", bif.Message, "#5");
                        Assert.IsNull (bif.FusionLog, "#6");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType ().FullName + ": message"), "#7");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": message",
                                bif.ToString (), "#7");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -85,12 +81,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#4");
                        Assert.AreEqual (string.Empty, bif.Message, "#5");
                        Assert.IsNull (bif.FusionLog, "#6");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": "), "#7");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": ",
                                bif.ToString (), "#7");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -135,12 +127,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#5");
                        Assert.AreEqual ("message", bif.Message, "#6");
                        Assert.IsNull (bif.FusionLog, "#7");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().IndexOf (ame.GetType ().FullName + ": something") != -1, "#8");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": message ---> "
                                + ame.GetType ().FullName + ": something", bif.ToString (), "#8");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -158,12 +146,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#5");
                        Assert.AreEqual (string.Empty, bif.Message, "#6");
                        Assert.IsNull (bif.FusionLog, "#7");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().IndexOf (ame.GetType ().FullName + ": something") != -1, "#8");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ":  ---> "
                                + ame.GetType ().FullName + ": something", bif.ToString (), "#8");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -188,9 +172,7 @@ namespace MonoTests.System
                        Assert.IsNull (bif.FusionLog, "#7");
                        Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType ().FullName), "#8");
                        Assert.IsTrue (bif.ToString ().IndexOf ("---> " + ame.GetType ().FullName) != -1, "#9");
-#if !TARGET_JVM // ToString always has a stack trace under TARGET_JVM
                        Assert.IsFalse (bif.ToString ().IndexOf (Environment.NewLine) != -1, "#10");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -207,12 +189,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#4");
                        Assert.AreEqual ("message", bif.Message, "#5");
                        Assert.IsNull (bif.FusionLog, "#6");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": message"), "#7");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": message",
                                bif.ToString (), "#7");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -256,12 +234,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#5");
                        Assert.AreEqual ("message", bif.Message, "#6");
                        Assert.IsNull (bif.FusionLog, "#7");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": message"), "#8");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": message",
                                bif.ToString (), "#8");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -278,12 +252,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#A4");
                        Assert.AreEqual ("message", bif.Message, "#A5");
                        Assert.IsNull (bif.FusionLog, "#A6");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": message"), "#A7");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": message",
                                bif.ToString (), "#A7");
-#endif // TARGET_JVM
 
                        bif = new BadImageFormatException (string.Empty, (string) null);
 
@@ -295,12 +265,8 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#B4");
                        Assert.AreEqual (string.Empty, bif.Message, "#B5");
                        Assert.IsNull (bif.FusionLog, "#B6");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": "), "#B7");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": ",
                                bif.ToString (), "#B7");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -318,11 +284,7 @@ namespace MonoTests.System
                        Assert.IsNotNull (bif.Message, "#5");
                        Assert.AreEqual (string.Empty, bif.Message, "#6");
                        Assert.IsNull (bif.FusionLog, "#7");
-#if TARGET_JVM // ToString always has a stack trace under TARGET_JVM
-                       Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType().FullName + ": "), "#8");
-#else
                        Assert.AreEqual (bif.GetType ().FullName + ": ", bif.ToString (), "#8");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -346,9 +308,7 @@ namespace MonoTests.System
                        Assert.IsNull (bif.FusionLog, "#5");
                        Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType ().FullName
                                + ": "), "#6");
-#if !TARGET_JVM // ToString always has a stack trace under TARGET_JVM
                        Assert.IsFalse (bif.ToString ().IndexOf (Environment.NewLine) != -1, "#7");
-#endif // TARGET_JVM
                }
 
                [Test]
@@ -412,9 +372,7 @@ namespace MonoTests.System
                        Assert.IsNull (bif.FusionLog, "#B6");
                        Assert.IsTrue (bif.ToString ().StartsWith (bif.GetType ().FullName
                                + ": "), "#B7");
-#if !TARGET_JVM // ToString always has a stack trace under TARGET_JVM
                        Assert.IsFalse (bif.ToString ().IndexOf (Environment.NewLine) != -1, "#B8");
-#endif // TARGET_JVM
                        Assert.IsTrue (bif.ToString ().IndexOf ("''") != -1, "#B9");
                }
        }
index 6467fe44115ced7f5784024b9e14861d86ed5e9e..8aee8a9cc657db1a0dc9cdd3bdeb26f77da10970 100644 (file)
@@ -2923,7 +2923,6 @@ namespace MonoTests.System {
 
                [Test]
                [ExpectedException (typeof (FormatException))]
-               [Category ("TargetJvmNotWorking")]
                public void FromBase64CharArray_Empty ()
                {
                        Convert.FromBase64CharArray (new char[0], 0, 0);
@@ -2931,7 +2930,6 @@ namespace MonoTests.System {
 
                [Test]
                [ExpectedException (typeof (FormatException))]
-               [Category ("TargetJvmNotWorking")]
                public void FormatBase64CharArray_OnlyWhitespace ()
                {
                        Convert.FromBase64CharArray (new char[3] {' ', 
@@ -3061,7 +3059,6 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void FromBase64_Empty ()
                {
                        Assert.AreEqual (new byte[0], Convert.FromBase64String (string.Empty));
index 7e20b32d6fc5cea912b5b898eb50ce8b18f12661..dc02ab58663032c6011fa5917b6dedc4b70b17de 100644 (file)
@@ -198,9 +198,7 @@ namespace MonoTests.System
                                new ToStringTest ("E", Decimal.MinValue, "-7.922816E+028"),
                                new ToStringTest ("E3", Decimal.MinValue, "-7.923E+028"),
                                new ToStringTest ("E28", Decimal.MinValue, "-7.9228162514264337593543950335E+028"),
-#if !TARGET_JVM // TargetJvmNotWorking
                                new ToStringTest ("E30", Decimal.MinValue, "-7.922816251426433759354395033500E+028"),
-#endif
                                new ToStringTest ("E0", Decimal.MinValue, "-8E+028"),
                                new ToStringTest ("N3", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335.000"),
                                new ToStringTest ("N0", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335"),
@@ -288,7 +286,6 @@ namespace MonoTests.System
                }
                
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void TestPercentPattern ()
                {
                        NumberFormatInfo nfi2 = (NumberFormatInfo) NfiUser.Clone ();
@@ -342,7 +339,6 @@ namespace MonoTests.System
                };
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void TestParse ()
                {
 
@@ -1140,7 +1136,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void TryParse ()
                {
                        Decimal r;
index d87cbb1173bd1d82bea418842652358a2471ccbb..aa39bad89918df73061366771587a9ed97b11252 100644 (file)
@@ -136,25 +136,10 @@ namespace MonoTests.System
             }\r
         }\r
 \r
-#if TARGET_JVM\r
-        // Under TARGET_JVm we have a slightly better precision (becuase of\r
-        // using Java BigDecimal).\r
-        private bool AreNotEqual(Decimal v1, Decimal v2)\r
-        {\r
-            Decimal delta = v1 - v2;\r
-            if (delta < 0m)\r
-                delta = -delta;\r
-           Decimal absV1 = v1 < 0m ? -v1 : v1;\r
-            if (absV1 < 1m)\r
-                return delta > 1E-27m;\r
-            return delta / absV1 > 1E-27m;\r
-        }\r
-#else\r
         private bool AreNotEqual(Decimal v1, Decimal v2)\r
         {\r
             return v1 != v2;\r
         }\r
-#endif\r
 \r
        [Test]\r
             \r
index e45efdbd1a370cb1d46c416fbb6dd1ef30e64969..8d9c622262ead8c3487416dcf8c97b3bf2e4912a 100644 (file)
@@ -851,7 +851,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void CoContraVariance ()
                {
                        CoContraVariantDelegate d = (CoContraVariantDelegate)
index 8b6823ac1013396ef58fb0d23f905e5557d07032..6b42976a24496a7e3b3f40d26b76d4c93b9fa680 100644 (file)
@@ -201,30 +201,22 @@ namespace MonoTests.System
 
                        Assert.AreEqual ("00", TestingEnum4.This.ToString ("x"), "#B1");
                        Assert.AreEqual ("00", TestingEnum4.This.ToString ("X"), "#B2");
-#if !TARGET_JVM // This appears not to work under .Net
                        Assert.AreEqual ("ff", TestingEnum4.Test.ToString ("x"), "#B3");
-#endif // TARGET_JVM
                        Assert.AreEqual ("FF", TestingEnum4.Test.ToString ("X"), "#B4");
 
                        Assert.AreEqual ("0000", TestingEnum5.This.ToString ("x"), "#C1");
                        Assert.AreEqual ("0000", TestingEnum5.This.ToString ("X"), "#C2");
-#if !TARGET_JVM // This appears not to work under .Net
                        Assert.AreEqual ("7fff", TestingEnum5.Test.ToString ("x"), "#C3");
-#endif // TARGET_JVM
                        Assert.AreEqual ("7FFF", TestingEnum5.Test.ToString ("X"), "#C4");
 
                        Assert.AreEqual ("00000000", TestingEnum6.This.ToString ("x"), "#D1");
                        Assert.AreEqual ("00000000", TestingEnum6.This.ToString ("X"), "#D2");
-#if !TARGET_JVM // This appears not to work under .Net
                        Assert.AreEqual ("7fffffff", TestingEnum6.Test.ToString ("x"), "#D3");
-#endif // TARGET_JVM
                        Assert.AreEqual ("7FFFFFFF", TestingEnum6.Test.ToString ("X"), "#D4");
 
                        Assert.AreEqual ("0000000000000000", TestingEnum3.This.ToString ("x"), "#E1");
                        Assert.AreEqual ("0000000000000000", TestingEnum3.This.ToString ("X"), "#E2");
-#if !TARGET_JVM // This appears not to work under .Net
                        Assert.AreEqual ("ffffffffffffffff", TestingEnum3.Test.ToString ("x"), "#E3");
-#endif // TARGET_JVM
                        Assert.AreEqual ("FFFFFFFFFFFFFFFF", TestingEnum3.Test.ToString ("X"), "#E4");
                }
 
index 442d7c6db5643d1c72fd195d6e6057118e034bba..9a9f65a5e53948dd3889650cf75b2c68a5d27ee4 100644 (file)
@@ -138,7 +138,7 @@ namespace MonoTests.System
                        Assert.IsFalse (d.IsSynchronized, "IsSynchronized");
                }
 
-#if NET_2_0 && !TARGET_JVM && !NET_2_1
+#if NET_2_0 && !NET_2_1
                [Test] // bug #333740
                public void GetEnvironmentVariables_NewlySet ()
                {
@@ -176,7 +176,6 @@ namespace MonoTests.System
                        Environment.GetEnvironmentVariables ((EnvironmentVariableTarget)Int32.MinValue);
                }
 
-#if !TARGET_JVM // Environment.SetEnvironmentVariable not supported under TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void SetEnvironmentVariable_Target_Invalid ()
@@ -228,7 +227,6 @@ namespace MonoTests.System
                        Environment.SetEnvironmentVariable ("A3", "\0");
                        Assert.IsNull (Environment.GetEnvironmentVariables ()["A3"]);
                }
-#endif // TARGET_JVM
 #endif
        }
 }
index d5e325bf882d0ebae539d38ad1b38de0bda63894..ad6cfb839eb208603a8d6067561c7b931f02172d 100644 (file)
@@ -17,11 +17,7 @@ namespace MonoTests.System
        public class MathTest
        {
                private static double double_epsilon =
-#if TARGET_JVM
-                       1E-15;
-#else
                        double.Epsilon;
-#endif
 
                static double x = 0.1234;
                static double y = 12.345;
@@ -521,11 +517,9 @@ namespace MonoTests.System
                                iTest++;
                                Assert.IsTrue (Double.IsNaN (Math.Pow (1, Double.NaN)),
                                        "Math.Pow(1, NaN) should be NaN");
-#if !TARGET_JVM
                                iTest++;
                                Assert.IsTrue (Double.IsNaN (Math.Pow (Double.NaN, 0)),
                                        "Math.Pow(NaN, 0) should be NaN");
-#endif
                                iTest++;
                                Assert.IsTrue (1.0 == Math.Pow (-1, Double.MaxValue),
                                        "Math.Pow(-1, MaxValue) should be 1.0");
index f62b6f9e61c25507b37ffabef72480c5d3587339..585082a0f93bea3bd84830cfcb5faf2ea85766b4 100644 (file)
@@ -43,17 +43,10 @@ namespace MonoTests.System
        {
                private CultureInfo old_culture;
 
-#if TARGET_JVM // BinaryFormatter is Java based under TARGET_JVM.
-               private BinaryFormatter CreateBinaryFormatter()
-               {
-                       return (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-               }
-#else
                private BinaryFormatter CreateBinaryFormatter()
                {
                        return new BinaryFormatter();
                }
-#endif // TARGET_JVM
 
                [SetUp]
                public void SetUp ()
index 82675d01cd6f6499376ee6438682f9b9fa46312c..b34efa5cbc81bd92a329a2e8ff43dcdb378f869b 100644 (file)
@@ -62,7 +62,6 @@ public class StringTest
        }
 
 
-#if !TARGET_JVM
        [Test] // ctor (Char [])
        public unsafe void Constructor2 ()
        {
@@ -70,7 +69,6 @@ public class StringTest
                Assert.AreEqual (String.Empty, new String (new Char [0]), "#2");
                Assert.AreEqual ("A", new String (new Char [1] {'A'}), "#3");
        }
-#endif
 
        [Test] // ctor (Char, Int32)
        public void Constructor4 ()
@@ -169,7 +167,6 @@ public class StringTest
                }
        }
 
-#if !TARGET_JVM
        [Test]
        public unsafe void CharPtrConstructor ()
        {
@@ -524,7 +521,6 @@ public class StringTest
 
                Assert.AreEqual (String.Empty, new String ((sbyte*) null, 1, 0, Encoding.Default), "#F");
        }
-#endif
        [Test]
        public void Length ()
        {
@@ -2642,9 +2638,7 @@ public class StringTest
                Assert.AreEqual (-1, s1.LastIndexOf("original", s1.Length-11), "stepped string index #3");
                Assert.AreEqual (-1, s1.LastIndexOf("translator", 2), "stepped string index #4");
                Assert.AreEqual (0, string.Empty.LastIndexOf(string.Empty, 0), "stepped string index #5");
-#if !TARGET_JVM
                Assert.AreEqual (-1, string.Empty.LastIndexOf("A", -1), "stepped string index #6");
-#endif
                Assert.AreEqual (10, s1.LastIndexOf("rig", s1.Length-1, 10), "stepped limited string index #1");
                Assert.AreEqual (-1, s1.LastIndexOf("rig", s1.Length, 3), "stepped limited string index #2");
                Assert.AreEqual (10, s1.LastIndexOf("rig", s1.Length-2, 15), "stepped limited string index #3");
@@ -3204,9 +3198,7 @@ public class StringTest
                Assert.AreEqual (s2.Replace("..", "."), "..aaaaaaa.bbbbbbbbb,......ccccccc.u..");
 
                // Test replacing null characters (bug #67395)
-#if !TARGET_JVM //bug #7276
                Assert.AreEqual ("is this ok ?", "is \0 ok ?".Replace ("\0", "this"), "should not strip content after nullchar");
-#endif
        }
 
        [Test]
index 930be4fefe24a891ab2081c1461bf8eb3c8c8cbe..6f97c359ebc9c9c36e5b56bdbf6b76bcca114680 100644 (file)
@@ -177,7 +177,6 @@ public class TimeZoneTest {
         }
 
        [Test]
-       [Category ("TargetJvmNotWorking")]
        public void CurrentTimeZone_SerializationRoundtrip ()
        {
                TimeZone tz = TimeZone.CurrentTimeZone;
index 6d5431e082d30b8533e4c1a318ee66c3d2d66236..00131c8d47f1d59ef4266e335ec71b293424a720 100644 (file)
@@ -297,16 +297,11 @@ namespace MonoTests.System
                        Assert.AreEqual (typeof (ICloneable[][]).IsAssignableFrom (typeof (Duper[][])), true, "#12");
 
                        // Tests for vectors<->one dimensional arrays */
-#if TARGET_JVM // Lower bounds arrays are not supported for TARGET_JVM.
-                       Array arr1 = Array.CreateInstance (typeof (int), new int[] {1});
-                       Assert.AreEqual (typeof (int[]).IsAssignableFrom (arr1.GetType ()), true, "#13");
-#else
                        Array arr1 = Array.CreateInstance (typeof (int), new int[] {1}, new int[] {0});
                        Array arr2 = Array.CreateInstance (typeof (int), new int[] {1}, new int[] {10});
 
                        Assert.AreEqual (typeof (int[]).IsAssignableFrom (arr1.GetType ()), true, "#13");
                        Assert.AreEqual (typeof (int[]).IsAssignableFrom (arr2.GetType ()), false, "#14");
-#endif // TARGET_JVM
 
                        // Test that arrays of enums can be cast to their base types
                        Assert.AreEqual (typeof (int[]).IsAssignableFrom (typeof (TypeCode[])), true, "#15");
@@ -390,7 +385,6 @@ namespace MonoTests.System
                }
 
                [Test]
-               [Category ("TargetJvmNotWorking")]
                public void TestGetPropertyImpl ()
                {
                        // Test getting property that is exact
@@ -1517,7 +1511,6 @@ namespace MonoTests.System
                                                            typeof (long), new Type[0], null), "#2");
                }
 
-#if !TARGET_JVM // StructLayout not supported for TARGET_JVM
                [StructLayout(LayoutKind.Explicit, Pack = 4, Size = 64)]
                public class Class1
                {
@@ -1543,7 +1536,6 @@ namespace MonoTests.System
                        Assert.AreEqual (LayoutKind.Explicit, attr3.Value);
                        Assert.AreEqual (CharSet.Unicode, attr3.CharSet);
                }
-#endif // TARGET_JVM
 
                [Test]
                public void Namespace ()
@@ -2786,7 +2778,7 @@ PublicKeyToken=b77a5c561934e089"));
                        Assert.IsNull (i);
                }
 
-#if !TARGET_JVM && !MOBILE // Reflection.Emit is not supported for TARGET_JVM
+#if !MOBILE
                [Test]
                public void EqualsUnderlyingType ()
                {
@@ -2805,7 +2797,7 @@ PublicKeyToken=b77a5c561934e089"));
 
                        Assert.IsTrue (typeof (int).Equals (e));
                }
-#endif // TARGET_JVM
+#endif
 
                [Test]
                public void Equals_Type_Null ()
index 8e8a267a32caeba36fe35b36a99308130a3531b1..b859b556623431806c1cc68c46685854fe30ef1a 100644 (file)
@@ -47,18 +47,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("MONO CLI")]
 [assembly: AssemblyCopyright("(c) 2003 Various Authors")]
 [assembly: AssemblyTrademark("")]
-#if TARGET_JVM
-[assembly: CLSCompliant(false)]
-#else
 [assembly: CLSCompliant(true)]
-#endif
 [assembly: ComVisible(false)]
 [assembly: AssemblyDefaultAlias("mono-service.exe")]
 [assembly: AssemblyInformationalVersion("0.0.0.1")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 [assembly: AllowPartiallyTrustedCallers()]
-#if !TARGET_JVM
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("../../class/mono.snk")]
-#endif
index 706d2cfc7620eabdb5f9b6ff0148bcfbed315175..174176f678888392853dc3fdfc604e0a58c662c0 100644 (file)
@@ -5,7 +5,7 @@ using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Xsl;
 using System.Xml.XPath;
-#if !TARGET_JVM && !MSNET
+#if !MSNET
 using Commons.Xml.Nvdl;
 using Commons.Xml.Relaxng;
 using Commons.Xml.Relaxng.Rnc;
@@ -63,7 +63,7 @@ environment variable that affects behavior:
                        case "--help":
                                Usage ();
                                return;
-#if !TARGET_JVM && !MSNET
+#if !MSNET
                        case "--validate":
                                ValidateAuto (args);
                                return;
@@ -95,7 +95,7 @@ environment variable that affects behavior:
                        }
                }
 
-#if !TARGET_JVM && !MSNET
+#if !MSNET
                static void ValidateAuto (string [] args)
                {
                        if (args.Length < 1) {