Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -23,7 +23,6 @@
// 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_4_0
using System;
using System.Collections.Generic;
using System.IO;
@@ -75,11 +74,7 @@ namespace MonoTests.System.Web.Util
[TestFixture]
public class HttpEncoderTest
{
#if NET_4_0
const string notEncoded = "!()*-._";
#else
const string notEncoded = "!'()*-._";
#endif
static char [] hexChars = "0123456789abcdef".ToCharArray ();
[Test]
@@ -412,4 +407,3 @@ namespace MonoTests.System.Web.Util
#endregion
}
}
#endif

View File

@@ -107,7 +107,6 @@ namespace MonoTests.System.Web.Util {
section.Validation = MachineKeyValidation.SHA1;
Encrypt_RoundTrip (section);
}
#if NET_4_0
[Test]
public void Encrypt_RoundTrip_HMACSHA256 ()
{
@@ -139,7 +138,6 @@ namespace MonoTests.System.Web.Util {
section.ValidationAlgorithm = "alg:HMACRIPEMD160";
EncryptSign_RoundTrip (section);
}
#endif
public void EncryptSign_RoundTrip (MachineKeySection section)
{
byte [] data = new byte [14];
@@ -196,7 +194,6 @@ namespace MonoTests.System.Web.Util {
section.Validation = MachineKeyValidation.SHA1;
EncryptSign_RoundTrip (section);
}
#if NET_4_0
[Test]
public void EncryptSign_RoundTrip_HMACSHA256 ()
{
@@ -228,7 +225,6 @@ namespace MonoTests.System.Web.Util {
section.ValidationAlgorithm = "alg:HMACRIPEMD160";
EncryptSign_RoundTrip (section);
}
#endif
public void Validation_RoundTrip (MachineKeySection section)
{
byte [] data = new byte [] { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 };
@@ -282,7 +278,6 @@ namespace MonoTests.System.Web.Util {
Validation_RoundTrip (section);
}
#if NET_4_0
[Test]
public void Validation_RoundTrip_HMACSHA256 ()
{
@@ -314,7 +309,6 @@ namespace MonoTests.System.Web.Util {
section.ValidationAlgorithm = "alg:HMACRIPEMD160";
Validation_RoundTrip (section);
}
#endif
[Test]
public void GetHexString ()
{

View File

@@ -24,7 +24,6 @@
// 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_4_0
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -97,4 +96,3 @@ namespace MonoTests.System.Web.Util
}
}
}
#endif