From b22694a2a19be8b3004d3b455333aec728f03982 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Mon, 22 Jun 2020 18:55:41 +0200
Subject: [PATCH] moved 4_Ballod_test to tests/

---
 src/app/editor/example-contracts.js          |  4 ++--
 test-browser/tests/defaultLayout.test.js     |  2 +-
 test-browser/tests/solidityUnittests.test.js | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/editor/example-contracts.js b/src/app/editor/example-contracts.js
index 34c6ea9a64..a01dead068 100644
--- a/src/app/editor/example-contracts.js
+++ b/src/app/editor/example-contracts.js
@@ -227,7 +227,7 @@ contract Ballot {
 
 var ballotTest = `pragma solidity >=0.4.22 <0.7.0;
 import "remix_tests.sol"; // this import is automatically injected by Remix.
-import "./3_Ballot.sol";
+import "../3_Ballot.sol";
 
 contract BallotTest {
    
@@ -255,6 +255,6 @@ module.exports = {
   storage: { name: '1_Storage.sol', content: storage },
   owner: { name: '2_Owner.sol', content: owner },
   ballot: { name: '3_Ballot.sol', content: ballot },
-  ballot_test: { name: '4_Ballot_test.sol', content: ballotTest },
+  ballot_test: { name: 'tests/4_Ballot_test.sol', content: ballotTest },
   basic: { name: 'basic.sol', content: basic }
 }
diff --git a/test-browser/tests/defaultLayout.test.js b/test-browser/tests/defaultLayout.test.js
index f4857c7f86..99d6ccc7a5 100644
--- a/test-browser/tests/defaultLayout.test.js
+++ b/test-browser/tests/defaultLayout.test.js
@@ -18,7 +18,7 @@ module.exports = {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
     .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
     .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
-    .waitForElementVisible('li[key="browser/4_Ballot_test.sol"]')
+    .waitForElementVisible('li[key="browser/tests/4_Ballot_test.sol"]')
   },
 
   'Loads Main View': function (browser) {
diff --git a/test-browser/tests/solidityUnittests.test.js b/test-browser/tests/solidityUnittests.test.js
index 3002d35202..8c7c1eafba 100644
--- a/test-browser/tests/solidityUnittests.test.js
+++ b/test-browser/tests/solidityUnittests.test.js
@@ -40,7 +40,7 @@ module.exports = {
 
   'Should run simple unit test `simple_storage_test.sol` ': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('simple_storage_test.sol', sources[0]['browser/tests/simple_storage_test.sol'])
+    .addFile('tests/simple_storage_test.sol', sources[0]['browser/tests/simple_storage_test.sol'])
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
     .click('*[data-id="testTabCheckAllTests"]')
@@ -60,7 +60,7 @@ module.exports = {
   'Should run advance unit test using natspec and experimental ABIEncoderV2 `ks2b_test.sol` ': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
     .clickLaunchIcon('fileExplorers')
-    .addFile('ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
+    .addFile('tests/ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
     .click('*[data-id="testTabCheckAllTests"]')
@@ -100,7 +100,7 @@ module.exports = {
 
   'Should fail on compilation': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('compilationError_test.sol', sources[0]['browser/compilationError_test.sol'])
+    .addFile('tests/compilationError_test.sol', sources[0]['browser/compilationError_test.sol'])
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/compilationError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
@@ -115,7 +115,7 @@ module.exports = {
 
   'Should fail on deploy': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('deployError_test.sol', sources[0]['browser/tests/deployError_test.sol'])
+    .addFile('tests/deployError_test.sol', sources[0]['browser/tests/deployError_test.sol'])
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/deployError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
@@ -129,7 +129,7 @@ module.exports = {
 
   'Should fail when parameters are to method in test contract': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('methodFailure_test.sol', sources[0]['browser/tests/methodFailure_test.sol'])
+    .addFile('tests/methodFailure_test.sol', sources[0]['browser/tests/methodFailure_test.sol'])
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/methodFailure_test.sol')
     .clickLaunchIcon('solidityUnitTesting')