From fbdc95e6a3504a33fa8ab8b87a30b19a38b5afd5 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Wed, 7 Jun 2006 16:50:56 +0000 Subject: [PATCH] added back csharp m2 repo git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@412454 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-dotnet/pom.xml | 8 + .../src/main/csharp/CommonAssemblyInfo.cs | 2 +- .../ActiveMQ/OpenWire/BooleanStreamTest.cs | 215 +++++++++--------- .../src/test/csharp/CommonAssemblyInfo.cs | 2 +- 4 files changed, 118 insertions(+), 109 deletions(-) diff --git a/activemq-dotnet/pom.xml b/activemq-dotnet/pom.xml index f1fef11766..c1f51922df 100644 --- a/activemq-dotnet/pom.xml +++ b/activemq-dotnet/pom.xml @@ -10,6 +10,14 @@ activemq-dotnet dotnet-library + + + maven-csharp + maven-csharp + http://maven-csharp.javaforge.com/repo + + + target/dotnet-assembly diff --git a/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs b/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs index bd0329e411..b2fe01f3e2 100644 --- a/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs +++ b/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs @@ -22,6 +22,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")] [assembly: AssemblyTrademarkAttribute("")] [assembly: AssemblyCultureAttribute("")] -[assembly: AssemblyVersionAttribute("4.0.2266.0")] +[assembly: AssemblyVersionAttribute("4.0.2281.0")] [assembly: AssemblyInformationalVersionAttribute("4.0")] diff --git a/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs b/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs index 1dbedcd2cf..6ffb5d16b0 100644 --- a/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs +++ b/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs @@ -18,111 +18,112 @@ using NUnit.Framework; using System; using System.IO; -namespace ActiveMQ.OpenWire -{ - [TestFixture] - public class BooleanStreamTest - { - protected int endOfStreamMarker = 0x12345678; - int numberOfBytes = 8 * 200; - - public delegate bool GetBooleanValueDelegate(int index, int count); - - [Test] - public void TestBooleanMarshallingUsingAllTrue() - { - DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllTrue)); - } - public bool GetBooleanValueAllTrue(int index, int count) - { - return true; - } - - [Test] - public void TestBooleanMarshallingUsingAllFalse() - { - DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllFalse)); - } - public bool GetBooleanValueAllFalse(int index, int count) - { - return false; - } - - [Test] - public void TestBooleanMarshallingUsingAlternateTrueFalse() - { - DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateTrueFalse)); - } - public bool GetBooleanValueAlternateTrueFalse(int index, int count) - { - return (index & 1) == 0; - } - - [Test] - public void TestBooleanMarshallingUsingAlternateFalseTrue() - { - DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateFalseTrue)); - } - public bool GetBooleanValueAlternateFalseTrue(int index, int count) - { - return (index & 1) != 0; - } - - protected void DoTestBooleanStream(int numberOfBytes, GetBooleanValueDelegate valueDelegate) - { - for (int i = 1017; i < numberOfBytes; i++) - { - AssertMarshalBooleans(i, valueDelegate); - } - } - - protected void AssertMarshalBooleans(int count, GetBooleanValueDelegate valueDelegate) - { - BooleanStream bs = new BooleanStream(); - for (int i = 0; i < count; i++) - { - bs.WriteBoolean(valueDelegate(i, count)); - } - MemoryStream buffer = new MemoryStream(); - BinaryWriter ds = new OpenWireBinaryWriter(buffer); - bs.Marshal(ds); - ds.Write(endOfStreamMarker); - - // now lets read from the stream - - MemoryStream ins = new MemoryStream(buffer.ToArray()); - BinaryReader dis = new OpenWireBinaryReader(ins); - bs = new BooleanStream(); - bs.Unmarshal(dis); - - for (int i = 0; i < count; i++) - { - bool expected = valueDelegate(i, count); - - try - { - bool actual = bs.ReadBoolean(); - Assert.AreEqual(expected, actual); - } - catch (Exception e) - { - Assert.Fail("Failed to parse bool: " + i + " out of: " + count + " due to: " + e); - } - } - int marker = dis.ReadInt32(); - Assert.AreEqual(endOfStreamMarker, marker, "did not match: "+endOfStreamMarker+" and "+marker); - - // lets try read and we should get an exception - try - { - dis.ReadByte(); - Assert.Fail("Should have reached the end of the stream"); - } - catch (IOException) - { - } - } - - } -} +namespace ActiveMQ.OpenWire { + [ TestFixture ] + public class BooleanStreamTest + { + protected int endOfStreamMarker = 0x12345678; + int numberOfBytes = 8 * 200; + public delegate bool GetBooleanValueDelegate(int index, int count); + + [ Test ] + public void TestBooleanMarshallingUsingAllTrue() + { + DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllTrue)); + } + public bool GetBooleanValueAllTrue(int index, int count) + { + return true; + } + + [ Test ] + public void TestBooleanMarshallingUsingAllFalse() + { + DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllFalse)); + } + public bool GetBooleanValueAllFalse(int index, int count) + { + return false; + } + + [ Test ] + public void TestBooleanMarshallingUsingAlternateTrueFalse() + { + DoTestBooleanStream( + numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateTrueFalse)); + } + public bool GetBooleanValueAlternateTrueFalse(int index, int count) + { + return (index & 1) == 0; + } + + [ Test ] + public void TestBooleanMarshallingUsingAlternateFalseTrue() + { + DoTestBooleanStream( + numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateFalseTrue)); + } + public bool GetBooleanValueAlternateFalseTrue(int index, int count) + { + return (index & 1) != 0; + } + + protected void DoTestBooleanStream(int numberOfBytes, GetBooleanValueDelegate valueDelegate) + { + for (int i = 1017; i < numberOfBytes; i++) + { + AssertMarshalBooleans(i, valueDelegate); + } + } + + protected void AssertMarshalBooleans(int count, GetBooleanValueDelegate valueDelegate) + { + BooleanStream bs = new BooleanStream(); + for (int i = 0; i < count; i++) + { + bs.WriteBoolean(valueDelegate(i, count)); + } + MemoryStream buffer = new MemoryStream(); + BinaryWriter ds = new OpenWireBinaryWriter(buffer); + bs.Marshal(ds); + ds.Write(endOfStreamMarker); + + // now lets read from the stream + + MemoryStream ins = new MemoryStream(buffer.ToArray()); + BinaryReader dis = new OpenWireBinaryReader(ins); + bs = new BooleanStream(); + bs.Unmarshal(dis); + + for (int i = 0; i < count; i++) + { + bool expected = valueDelegate(i, count); + + try + { + bool actual = bs.ReadBoolean(); + Assert.AreEqual(expected, actual); + } + catch (Exception e) + { + Assert.Fail( + "Failed to parse bool: " + i + " out of: " + count + " due to: " + e); + } + } + int marker = dis.ReadInt32(); + Assert.AreEqual( + endOfStreamMarker, marker, "did not match: " + endOfStreamMarker + " and " + marker); + + // lets try read and we should get an exception + try + { + dis.ReadByte(); + Assert.Fail("Should have reached the end of the stream"); + } + catch (IOException) + { + } + } + } +} diff --git a/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs b/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs index cffcc2c47b..bd0a4f9d7e 100644 --- a/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs +++ b/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs @@ -22,6 +22,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")] [assembly: AssemblyTrademarkAttribute("")] [assembly: AssemblyCultureAttribute("")] -[assembly: AssemblyVersionAttribute("4.0.2266.0")] +[assembly: AssemblyVersionAttribute("4.0.2281.0")] [assembly: AssemblyInformationalVersionAttribute("4.0")]