Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -70,11 +70,7 @@ namespace MonoTests.System.ServiceModel.Configuration
public void BindingCollections () {
ServiceModelSectionGroup g = GetConfig ("Test/config/test1.config");
List<BindingCollectionElement> coll = g.Bindings.BindingCollections;
#if NET_3_5
Assert.AreEqual (20, coll.Count, "Count");
#else
Assert.AreEqual (16, coll.Count, "Count");
#endif
}
[Test]

View File

@@ -70,7 +70,7 @@ namespace MonoTests.System.ServiceModel.Dispatcher
};
client.GetDataAsync ();
if (!wait.WaitOne (TimeSpan.FromSeconds (10)))
if (!wait.WaitOne (TimeSpan.FromSeconds (20)))
Assert.Fail ("timeout");
} finally {
serviceHost.Close ();

View File

@@ -251,8 +251,8 @@ namespace MonoTests.System.ServiceModel.Security
sw = new StringWriter ();
using (XmlWriter w = XmlWriter.Create (sw, GetWriterSettings ())) {
new WSSecurityTokenSerializer (SecurityVersion.WSSecurity10).WriteKeyIdentifierClause (w, ic);
Assert.AreEqual (expected, sw.ToString (), "WSS1.0");
}
Assert.AreEqual (expected, sw.ToString (), "WSS1.0");
}
[Test]