Resolve merge commits, stage 1

author: Tom 2011-09-04 07:06:36 -0700
committer: Tom 2011-09-04 07:06:36 -0700
commit: 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch)
tree: 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Framework/Tests
parent: Guard another nullref (diff)
parent: Fixed BulletSim config files for Linux *.so libraries. (diff)
download: opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 05d8469..0dce414 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests
            SecureSessionId = UUID.Random();
            SessionId = UUID.Random();
-            AvAppearance = new AvatarAppearance(AgentId);
+            AvAppearance = new AvatarAppearance();
            VisualParams = new byte[218];
            //body
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index 6c98897..9615f1b 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Tests
            m_agentCircuitData1 = new AgentCircuitData();
            m_agentCircuitData1.AgentID = AgentId1;
-            m_agentCircuitData1.Appearance = new AvatarAppearance(AgentId1);
+            m_agentCircuitData1.Appearance = new AvatarAppearance();
            m_agentCircuitData1.BaseFolder = BaseFolder;
            m_agentCircuitData1.CapsPath = CapsPath;
            m_agentCircuitData1.child = false;
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Tests
            m_agentCircuitData2 = new AgentCircuitData();
            m_agentCircuitData2.AgentID = AgentId2;
-            m_agentCircuitData2.Appearance = new AvatarAppearance(AgentId2);
+            m_agentCircuitData2.Appearance = new AvatarAppearance();
            m_agentCircuitData2.BaseFolder = BaseFolder;
            m_agentCircuitData2.CapsPath = CapsPath;
            m_agentCircuitData2.child = false;
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 5eac411..c5a20e7 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Framework.Tests
                            "Magnitude of vector was incorrect.");
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
-                bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);
+                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
@@ -94,12 +94,12 @@ namespace OpenSim.Framework.Tests
                            "Magnitude of vector was incorrect.");
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
-                bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);
+                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
                d = delegate() { Util.GetNormalizedVector(v2); };
-                causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);
+                causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
            }
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Tests
                            "Magnitude of vector was incorrect.");
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
-                bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);
+                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
author	Tom	2011-09-04 07:06:36 -0700
committer	Tom	2011-09-04 07:06:36 -0700
commit	66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch)
tree	76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Framework/Tests
parent	Guard another nullref (diff)
parent	Fixed BulletSim config files for Linux *.so libraries. (diff)
download	opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz

diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs index 05d8469..0dce414 100644 --- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs +++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests
64	SecureSessionId = UUID.Random();	64	SecureSessionId = UUID.Random();
65	SessionId = UUID.Random();	65	SessionId = UUID.Random();
66		66
67	AvAppearance = new AvatarAppearance(AgentId);	67	AvAppearance = new AvatarAppearance();
68	VisualParams = new byte[218];	68	VisualParams = new byte[218];
69		69
70	//body	70	//body


diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs index 6c98897..9615f1b 100644 --- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs +++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Tests
68		68
69	m_agentCircuitData1 = new AgentCircuitData();	69	m_agentCircuitData1 = new AgentCircuitData();
70	m_agentCircuitData1.AgentID = AgentId1;	70	m_agentCircuitData1.AgentID = AgentId1;
71	m_agentCircuitData1.Appearance = new AvatarAppearance(AgentId1);	71	m_agentCircuitData1.Appearance = new AvatarAppearance();
72	m_agentCircuitData1.BaseFolder = BaseFolder;	72	m_agentCircuitData1.BaseFolder = BaseFolder;
73	m_agentCircuitData1.CapsPath = CapsPath;	73	m_agentCircuitData1.CapsPath = CapsPath;
74	m_agentCircuitData1.child = false;	74	m_agentCircuitData1.child = false;
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Tests
83		83
84	m_agentCircuitData2 = new AgentCircuitData();	84	m_agentCircuitData2 = new AgentCircuitData();
85	m_agentCircuitData2.AgentID = AgentId2;	85	m_agentCircuitData2.AgentID = AgentId2;
86	m_agentCircuitData2.Appearance = new AvatarAppearance(AgentId2);	86	m_agentCircuitData2.Appearance = new AvatarAppearance();
87	m_agentCircuitData2.BaseFolder = BaseFolder;	87	m_agentCircuitData2.BaseFolder = BaseFolder;
88	m_agentCircuitData2.CapsPath = CapsPath;	88	m_agentCircuitData2.CapsPath = CapsPath;
89	m_agentCircuitData2.child = false;	89	m_agentCircuitData2.child = false;


diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index 5eac411..c5a20e7 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Framework.Tests
61	"Magnitude of vector was incorrect.");	61	"Magnitude of vector was incorrect.");
62		62
63	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };	63	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
64	bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);	64	bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
65	Assert.That(causesArgumentException, Is.True,	65	Assert.That(causesArgumentException, Is.True,
66	"Getting magnitude of null vector did not cause argument exception.");	66	"Getting magnitude of null vector did not cause argument exception.");
67		67
@@ -94,12 +94,12 @@ namespace OpenSim.Framework.Tests
94	"Magnitude of vector was incorrect.");	94	"Magnitude of vector was incorrect.");
95		95
96	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };	96	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
97	bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);	97	bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
98	Assert.That(causesArgumentException, Is.True,	98	Assert.That(causesArgumentException, Is.True,
99	"Getting magnitude of null vector did not cause argument exception.");	99	"Getting magnitude of null vector did not cause argument exception.");
100		100
101	d = delegate() { Util.GetNormalizedVector(v2); };	101	d = delegate() { Util.GetNormalizedVector(v2); };
102	causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);	102	causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
103	Assert.That(causesArgumentException, Is.True,	103	Assert.That(causesArgumentException, Is.True,
104	"Getting magnitude of null vector did not cause argument exception.");	104	"Getting magnitude of null vector did not cause argument exception.");
105	}	105	}
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Tests
122	"Magnitude of vector was incorrect.");	122	"Magnitude of vector was incorrect.");
123		123
124	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };	124	TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
125	bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d);	125	bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
126	Assert.That(causesArgumentException, Is.True,	126	Assert.That(causesArgumentException, Is.True,
127	"Getting magnitude of null vector did not cause argument exception.");	127	"Getting magnitude of null vector did not cause argument exception.");
128		128