projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2619 from directhex/dont_remap_npgsql
[mono.git]
/
mcs
/
class
/
System.Configuration
/
Test
/
System.Configuration
/
TimeSpanSecondsOrInfiniteConverterTest.cs
diff --git
a/mcs/class/System.Configuration/Test/System.Configuration/TimeSpanSecondsOrInfiniteConverterTest.cs
b/mcs/class/System.Configuration/Test/System.Configuration/TimeSpanSecondsOrInfiniteConverterTest.cs
index 20fd04f4eb6bc35be99c8c509a21711faf963979..9166959817ca2c21be8eab6fe8bc9a8651de6df5 100644
(file)
--- a/
mcs/class/System.Configuration/Test/System.Configuration/TimeSpanSecondsOrInfiniteConverterTest.cs
+++ b/
mcs/class/System.Configuration/Test/System.Configuration/TimeSpanSecondsOrInfiniteConverterTest.cs
@@
-27,7
+27,6
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Configuration;
using System;
using System.Configuration;
@@
-118,10
+117,7
@@
namespace MonoTests.System.Configuration {
}
[Test]
}
[Test]
- [ExpectedException (typeof (NullReferenceException))]
\r
-#if TARGET_JVM
\r
- [Category ("NotWorking")]
\r
-#endif
+ [ExpectedException (typeof (NullReferenceException))]
public void ConvertTo_NullError ()
{
TimeSpanSecondsOrInfiniteConverter cv = new TimeSpanSecondsOrInfiniteConverter ();
public void ConvertTo_NullError ()
{
TimeSpanSecondsOrInfiniteConverter cv = new TimeSpanSecondsOrInfiniteConverter ();
@@
-153,4
+149,3
@@
namespace MonoTests.System.Configuration {
}
}
}
}
-#endif