From eb0c7e7a9f0f122ecbb34d63b946087e4f038b2d Mon Sep 17 00:00:00 2001
From: Daviw Williams <david@volumesoffun.com>
Date: Fri, 7 Dec 2012 14:01:42 +0100
Subject: [PATCH] More work on volume unit test.

---
 tests/testvolume.cpp | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/testvolume.cpp b/tests/testvolume.cpp
index 4c7fb7b1..00c04fce 100644
--- a/tests/testvolume.cpp
+++ b/tests/testvolume.cpp
@@ -131,25 +131,46 @@ int32_t complexVolumeTest(void)
 		zSampler.movePositiveZ();
 	}
 
+	xSampler.setWrapMode(WrapModes::Clamp);
+	ySampler.setWrapMode(WrapModes::Border, 1);
+	zSampler.setWrapMode(WrapModes::Clamp, -1);
+
+	zSampler.setPosition(testVolume.getEnclosingRegion().getUpperX() + 2, testVolume.getEnclosingRegion().getUpperY() + 3, testVolume.getEnclosingRegion().getUpperZ() + 1);
+	for(int z = 0; z < testVolume.getEnclosingRegion().getDepthInVoxels() + 8; z++)
+	{
+		ySampler = zSampler;
+		for(int y = 0; y < testVolume.getEnclosingRegion().getHeightInVoxels() + 3; y++)
+		{
+			xSampler = ySampler;
+			for(int x = 0; x < testVolume.getEnclosingRegion().getWidthInVoxels() + 5; x++)
+			{
+				result += xSampler.getVoxel();
+				xSampler.moveNegativeX();
+			}
+			ySampler.moveNegativeY();
+		}
+		zSampler.moveNegativeZ();
+	}
+
 	return result;
 }
 
 void TestVolume::testLargeVolume()
 {
 	int32_t result = complexVolumeTest< LargeVolume<int32_t> >();
-	QCOMPARE(result, static_cast<int32_t>(1018940544));
+	QCOMPARE(result, static_cast<int32_t>(1244008559));
 }
 
 void TestVolume::testRawVolume()
 {
 	int32_t result = complexVolumeTest< RawVolume<int32_t> >();
-	QCOMPARE(result, static_cast<int32_t>(1018940544));
+	QCOMPARE(result, static_cast<int32_t>(1244008559));
 }
 
 void TestVolume::testSimpleVolume()
 {
 	int32_t result = complexVolumeTest< SimpleVolume<int32_t> >();
-	QCOMPARE(result, static_cast<int32_t>(1018940544));
+	QCOMPARE(result, static_cast<int32_t>(1244008559));
 }
 
 QTEST_MAIN(TestVolume)