From d777bd9030c73aac8a60f88f71e72879dcb7c425 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Fri, 19 Oct 2018 12:27:46 +0200 Subject: [PATCH] moved before into describe to enable running of single unit tests --- test/keeper/ContractBase.test.ts | 12 ++++++------ test/keeper/ContractHandler.test.ts | 10 +++++----- test/keeper/Keeper.test.ts | 12 ++++++------ test/ocean/Account.test.ts | 16 ++++++++-------- test/ocean/Asset.test.ts | 26 +++++++++++++------------- test/ocean/Ocean.test.ts | 20 ++++++++++---------- test/ocean/Order.test.ts | 24 ++++++++++++------------ 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/test/keeper/ContractBase.test.ts b/test/keeper/ContractBase.test.ts index a77424a..d7daf16 100644 --- a/test/keeper/ContractBase.test.ts +++ b/test/keeper/ContractBase.test.ts @@ -5,13 +5,13 @@ import ContractBaseMock from "../mocks/ContractBase.Mock" const wrappedContract = new ContractBaseMock("OceanToken") -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() - wrappedContract.initMock() -}) +describe("ContractBase", () => { -describe("ContractWrapperBase", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + wrappedContract.initMock() + }) describe("#call()", () => { diff --git a/test/keeper/ContractHandler.test.ts b/test/keeper/ContractHandler.test.ts index 0f6510a..5ea96f7 100644 --- a/test/keeper/ContractHandler.test.ts +++ b/test/keeper/ContractHandler.test.ts @@ -3,13 +3,13 @@ import ConfigProvider from "../../src/ConfigProvider" import ContractHandler from "../../src/keeper/ContractHandler" import config from "../config" -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() -}) - describe("ContractHandler", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + }) + describe("#get()", () => { it("should load and get OceanToken correctly", async () => { diff --git a/test/keeper/Keeper.test.ts b/test/keeper/Keeper.test.ts index b70001b..89bae86 100644 --- a/test/keeper/Keeper.test.ts +++ b/test/keeper/Keeper.test.ts @@ -6,14 +6,14 @@ import config from "../config" let keeper: Keeper -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() - keeper = await Keeper.getInstance() -}) - describe("Keeper", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + keeper = await Keeper.getInstance() + }) + describe("public interface", () => { it("should have market", () => { diff --git a/test/ocean/Account.test.ts b/test/ocean/Account.test.ts index 6914f05..4b5f887 100644 --- a/test/ocean/Account.test.ts +++ b/test/ocean/Account.test.ts @@ -9,16 +9,16 @@ import config from "../config" let ocean: Ocean let accounts: Account[] -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() - ocean = await Ocean.getInstance(config) - - accounts = await ocean.getAccounts() -}) - describe("Account", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + ocean = await Ocean.getInstance(config) + + accounts = await ocean.getAccounts() + }) + describe("#getOceanBalance()", () => { it("should get initial ocean balance", async () => { diff --git a/test/ocean/Asset.test.ts b/test/ocean/Asset.test.ts index 4f9d96c..d799fe5 100644 --- a/test/ocean/Asset.test.ts +++ b/test/ocean/Asset.test.ts @@ -19,21 +19,21 @@ let testAsset: Asset let accounts: Account[] let testPublisher: Account -before(async () => { - ConfigProvider.configure(config) - ProviderProvider.setProvider(ProviderMock) - - await ContractHandler.deployContracts() - ocean = await Ocean.getInstance(config) - accounts = await ocean.getAccounts() - testPublisher = accounts[0] - testAsset = new Asset(testName, testDescription, testPrice, testPublisher) - - await ocean.register(testAsset) -}) - describe("Asset", () => { + before(async () => { + ConfigProvider.configure(config) + ProviderProvider.setProvider(ProviderMock) + + await ContractHandler.deployContracts() + ocean = await Ocean.getInstance(config) + accounts = await ocean.getAccounts() + testPublisher = accounts[0] + testAsset = new Asset(testName, testDescription, testPrice, testPublisher) + + await ocean.register(testAsset) + }) + describe("#purchase()", () => { it("should purchase an asset", async () => { diff --git a/test/ocean/Ocean.test.ts b/test/ocean/Ocean.test.ts index fc855ee..49b6212 100644 --- a/test/ocean/Ocean.test.ts +++ b/test/ocean/Ocean.test.ts @@ -17,18 +17,18 @@ const description = "This asset is pure owange" const price = 100 const timeout = 100000000 -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() - ocean = await Ocean.getInstance(config) - accounts = await ocean.getAccounts() - - testPublisher = accounts[0] - testAsset = new Asset(name, description, price, testPublisher) -}) - describe("Ocean", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + ocean = await Ocean.getInstance(config) + accounts = await ocean.getAccounts() + + testPublisher = accounts[0] + testAsset = new Asset(name, description, price, testPublisher) + }) + describe("#getInstance()", () => { it("should list accounts", async () => { diff --git a/test/ocean/Order.test.ts b/test/ocean/Order.test.ts index 8624502..d03c72c 100644 --- a/test/ocean/Order.test.ts +++ b/test/ocean/Order.test.ts @@ -20,20 +20,20 @@ let accounts: Account[] let testPublisher: Account let testConsumer: Account -before(async () => { - ConfigProvider.configure(config) - await ContractHandler.deployContracts() - ocean = await Ocean.getInstance(config) - accounts = await ocean.getAccounts() - testPublisher = accounts[0] - testConsumer = accounts[1] - // register an asset to play around with - testAsset = new Asset(testName, testDescription, testPrice, testPublisher) - await ocean.register(testAsset) -}) - describe("Order", () => { + before(async () => { + ConfigProvider.configure(config) + await ContractHandler.deployContracts() + ocean = await Ocean.getInstance(config) + accounts = await ocean.getAccounts() + testPublisher = accounts[0] + testConsumer = accounts[1] + // register an asset to play around with + testAsset = new Asset(testName, testDescription, testPrice, testPublisher) + await ocean.register(testAsset) + }) + describe("#pay()", async () => { it("should pay for an order", async () => {