Merge branch 'master' into stable

1 files changed, 33 insertions, 0 deletions

diff --git a/Source/UnitTests/Common/FixedSizeQueueTest.cpp b/Source/UnitTests/Common/FixedSizeQueueTest.cpp
new file mode 100644
index 0000000000..370eb0e7e7
--- /dev/null
+++ b/Source/UnitTests/Common/FixedSizeQueueTest.cpp
@@ -0,0 +1,33 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <gtest/gtest.h>
+
+#include "Common/FixedSizeQueue.h"
+
+TEST(FixedSizeQueue, Simple)
+{
+	FixedSizeQueue<int, 5> q;
+
+	EXPECT_EQ(0u, q.size());
+
+	q.push(0);
+	q.push(1);
+	q.push(2);
+	q.push(3);
+	q.push(4);
+	for (int i = 0; i < 1000; ++i)
+	{
+		EXPECT_EQ(i, q.front());
+		EXPECT_EQ(i, q.pop_front());
+		q.push(i + 5);
+	}
+	EXPECT_EQ(1000, q.pop_front());
+	EXPECT_EQ(1001, q.pop_front());
+	EXPECT_EQ(1002, q.pop_front());
+	EXPECT_EQ(1003, q.pop_front());
+	EXPECT_EQ(1004, q.pop_front());
+
+	EXPECT_EQ(0u, q.size());
+}