From 666e9fc52e9336c6e5e377c8d0e4ad4d63debbf5 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Fri, 19 Dec 2014 15:48:45 +0100
Subject: Restructured Manager deleteOrder unit test

---
 test/core/managed/ManagerTest.cpp | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'test')

diff --git a/test/core/managed/ManagerTest.cpp b/test/core/managed/ManagerTest.cpp
index 3272457..d7c0c17 100644
--- a/test/core/managed/ManagerTest.cpp
+++ b/test/core/managed/ManagerTest.cpp
@@ -601,10 +601,7 @@ public:
 	{
 	}
 
-	~TestDeleteOrderManaged() override
-	{
-		ids.push_back(id);
-	}
+	~TestDeleteOrderManaged() override { ids.push_back(id); }
 
 	void addRef(Handle<Managed> h) { refs.push_back(acquire(h)); }
 };
@@ -612,33 +609,36 @@ public:
 TEST(Manager, deleteOrder)
 {
 	std::vector<int> ids;
-	Manager mgr(1);
-
 	{
-		Rooted<TestDeleteOrderManaged> root{
-		    new TestDeleteOrderManaged{mgr, 0, ids}};
-		Rooted<TestDeleteOrderManaged> m1{
-		    new TestDeleteOrderManaged{mgr, 1, ids}};
-		Rooted<TestDeleteOrderManaged> m2{
-		    new TestDeleteOrderManaged{mgr, 2, ids}};
-		Rooted<TestDeleteOrderManaged> m3{
-		    new TestDeleteOrderManaged{mgr, 3, ids}};
-		Rooted<TestDeleteOrderManaged> m4{
-		    new TestDeleteOrderManaged{mgr, 4, ids}};
-		Rooted<TestDeleteOrderManaged> m5{
-		    new TestDeleteOrderManaged{mgr, 5, ids}};
-		Rooted<TestDeleteOrderManaged> m6{
-		    new TestDeleteOrderManaged{mgr, 6, ids}};
-		Rooted<TestDeleteOrderManaged> m7{
-		    new TestDeleteOrderManaged{mgr, 7, ids}};
-
-		root->addRef(m7);
-		m7->addRef(m2);
-		m2->addRef(m5);
-		m5->addRef(m1);
-		m1->addRef(m3);
-		m3->addRef(m6);
-		m6->addRef(m4);
+		Manager mgr;
+		{
+			Rooted<TestDeleteOrderManaged> root{
+				new TestDeleteOrderManaged{mgr, 0, ids}};
+			{
+				Rooted<TestDeleteOrderManaged> m1{
+					new TestDeleteOrderManaged{mgr, 1, ids}};
+				Rooted<TestDeleteOrderManaged> m2{
+					new TestDeleteOrderManaged{mgr, 2, ids}};
+				Rooted<TestDeleteOrderManaged> m3{
+					new TestDeleteOrderManaged{mgr, 3, ids}};
+				Rooted<TestDeleteOrderManaged> m4{
+					new TestDeleteOrderManaged{mgr, 4, ids}};
+				Rooted<TestDeleteOrderManaged> m5{
+					new TestDeleteOrderManaged{mgr, 5, ids}};
+				Rooted<TestDeleteOrderManaged> m6{
+					new TestDeleteOrderManaged{mgr, 6, ids}};
+				Rooted<TestDeleteOrderManaged> m7{
+					new TestDeleteOrderManaged{mgr, 7, ids}};
+
+				root->addRef(m7);
+				m7->addRef(m2);
+				m2->addRef(m5);
+				m5->addRef(m1);
+				m1->addRef(m3);
+				m3->addRef(m6);
+				m6->addRef(m4);
+			}
+		}
 	}
 
 	std::vector<int> expected{0, 7, 2, 5, 1, 3, 6, 4};
-- 
cgit v1.2.3