From b282427b4fc69cd399a009fddb8d7c0b8f33d247 Mon Sep 17 00:00:00 2001
From: Roman Rommel <roman.rommel@sap.com>
Date: Tue, 8 Jan 2019 09:37:24 +0100
Subject: [PATCH] [INTERNAL] All stubs are now restored using sinon.restore()

---
 test/lib/cli/commands/build.js   | 7 ++-----
 test/lib/cli/commands/serve.js   | 4 +---
 test/lib/cli/commands/tree.js    | 3 +--
 test/lib/cli/middlewares/base.js | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/lib/cli/commands/build.js b/test/lib/cli/commands/build.js
index bc30e1312..b27892b39 100644
--- a/test/lib/cli/commands/build.js
+++ b/test/lib/cli/commands/build.js
@@ -6,7 +6,6 @@ const builder = require("@ui5/builder").builder;
 const logger = require("@ui5/logger");
 let normalizerStub = null;
 let builderStub = null;
-let loggerStub = null;
 
 const args = {
 	_: [],
@@ -33,13 +32,11 @@ const defaultBuilderArgs = {
 test.beforeEach("Mocking before test execution", (t) => {
 	normalizerStub = sinon.stub(normalizer, "generateProjectTree");
 	builderStub = sinon.stub(builder, "build").returns(Promise.resolve());
-	loggerStub = sinon.stub(logger, "setShowProgress");
+	sinon.stub(logger, "setShowProgress");
 });
 
 test.afterEach("Restore mocks after test exection", (t) => {
-	loggerStub.restore();
-	builderStub.restore();
-	normalizerStub.restore();
+	sinon.restore();
 });
 
 test.serial("ui5 build (default) ", async (t) => {
diff --git a/test/lib/cli/commands/serve.js b/test/lib/cli/commands/serve.js
index 82c84d922..98f67ad4b 100644
--- a/test/lib/cli/commands/serve.js
+++ b/test/lib/cli/commands/serve.js
@@ -32,9 +32,7 @@ test.beforeEach("Stubbing modules before execution", (t) => {
 });
 
 test.afterEach("Stubs Cleanup", (t) => {
-	normalizerStub.restore();
-	serverStub.restore();
-	sslUtilStub.restore();
+	sinon.restore();
 });
 
 test.serial("ui5 serve: default", async (t) => {
diff --git a/test/lib/cli/commands/tree.js b/test/lib/cli/commands/tree.js
index 9b326048b..983617953 100644
--- a/test/lib/cli/commands/tree.js
+++ b/test/lib/cli/commands/tree.js
@@ -10,8 +10,7 @@ test.beforeEach("Stubbing modules before execution", (t) => {
 });
 
 test.afterEach("Stubbing modules before execution", (t) => {
-	normalizer.generateProjectTree.restore();
-	normalizer.generateDependencyTree.restore();
+	sinon.restore();
 });
 
 test.serial("ui5 tree (generates dependency tree before output)", async (t) => {
diff --git a/test/lib/cli/middlewares/base.js b/test/lib/cli/middlewares/base.js
index 4005d1663..bef05dbfc 100644
--- a/test/lib/cli/middlewares/base.js
+++ b/test/lib/cli/middlewares/base.js
@@ -8,7 +8,7 @@ test.beforeEach("Stubbing modules before execution", (t) => {
 });
 
 test.afterEach("Stubs Cleanup", (t) => {
-	logger.init.restore();
+	sinon.restore();
 });
 
 test.serial("uses default middleware", async (t) => {