update unit tests

libs/remix-tests/src/compiler.ts

@@ -88,16 +88,10 @@ export function compileFileOrFiles (filename: string, isDirectory: boolean, opts
   const filepath: string = (isDirectory ? filename : path.dirname(filename))
   const importsCallback = (url, cb) => {
     try {
-      console.log('inside importsCallback----url--->', url)
       if(fs.existsSync(url)) cb(null, fs.readFileSync(url, 'utf-8'))
       else {
-        console.log('inside else------->')
         const urlResolver = new RemixURLResolver()
-        urlResolver.resolve(url).then((result) => {
-          console.log('result------->', result)
-          cb(null, result.content)
-        })
-        .catch((error) => cb(error.message))
+        urlResolver.resolve(url).then((result) => cb(null, result.content)).catch((error) => cb(error.message))
       }
     } catch (e) {
       cb(e.message)

libs/remix-tests/tests/examples_0/assert_ok_test.sol

@@ -1,7 +1,7 @@
 import "remix_tests.sol"; // this import is automatically injected by Remix.
 
 
-import "./hardhat/console.sol";
+import "hardhat/console.sol";
 
 contract AssertOkTest {
 

libs/remix-tests/tests/examples_0/assert_ok_without_console_test.sol

@@ -1,12 +0,0 @@
-import "remix_tests.sol"; // this import is automatically injected by Remix.
-
-contract AssertOkTest {
-
-    function okPassTest() public {
-        Assert.ok(true, "okPassTest passes");
-    }
-
-    function okFailTest() public {
-        Assert.ok(false, "okFailTest fails");
-    }
-}

libs/remix-tests/tests/testRunner.cli.spec.ts

@@ -42,7 +42,7 @@ Commands:
       })
 
     test('remix-tests running a test file', () => {
-      const res = spawnSync(executablePath, [resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, [resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim()).toMatch(/:: Running remix-tests - Unit testing for solidity ::/)
       expect(res.stdout.toString().trim()).toMatch(/creation of library remix_tests.sol:Assert pending.../)
@@ -57,7 +57,7 @@ Commands:
     })
 
     test('remix-tests running a test file with custom compiler version', () => {
-      const res = spawnSync(executablePath, ['--compiler', '0.7.4', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--compiler', '0.7.4', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('Compiler version set to 0.7.4. Latest version is')).toBeTruthy()
       expect(res.stdout.toString().trim().includes('Loading remote solc version v0.7.4+commit.3f05b770 ...')).toBeTruthy()
@@ -71,13 +71,13 @@ Commands:
     })
 
     test('remix-tests running a test file with unavailable custom compiler version (should fail)', () => {
-      const res = spawnSync(executablePath, ['--compiler', '1.10.4', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--compiler', '1.10.4', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('No compiler found in releases with version 1.10.4')).toBeTruthy()
     })
 
     test('remix-tests running a test file with custom EVM', () => {
-      const res = spawnSync(executablePath, ['--evm', 'petersburg', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--evm', 'petersburg', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('EVM set to petersburg')).toBeTruthy()
       expect(res.stdout.toString().trim()).toMatch(/:: Running remix-tests - Unit testing for solidity ::/)
@@ -90,7 +90,7 @@ Commands:
     })
 
     test('remix-tests running a test file by enabling optimization', () => {
-      const res = spawnSync(executablePath, ['--optimize', 'true', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--optimize', 'true', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('Optimization is enabled')).toBeTruthy()
       expect(res.stdout.toString().trim()).toMatch(/:: Running remix-tests - Unit testing for solidity ::/)
@@ -103,7 +103,7 @@ Commands:
     })
 
     test('remix-tests running a test file by enabling optimization and setting runs', () => {
-      const res = spawnSync(executablePath, ['--optimize', 'true', '--runs', '300', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--optimize', 'true', '--runs', '300', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('Optimization is enabled')).toBeTruthy()
       expect(res.stdout.toString().trim().includes('Runs set to 300')).toBeTruthy()
@@ -117,13 +117,13 @@ Commands:
     })
 
     test('remix-tests running a test file without enabling optimization and setting runs (should fail)', () => {
-      const res = spawnSync(executablePath, ['--runs', '300', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--runs', '300', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('Optimization should be enabled for runs')).toBeTruthy()
     })
 
     test('remix-tests running a test file with all options', () => {
-      const res = spawnSync(executablePath, ['--compiler', '0.7.5', '--evm', 'istanbul', '--optimize', 'true', '--runs', '250', resolve(__dirname + '/examples_0/assert_ok_without_console_test.sol')])
+      const res = spawnSync(executablePath, ['--compiler', '0.7.5', '--evm', 'istanbul', '--optimize', 'true', '--runs', '250', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines
       expect(res.stdout.toString().trim().includes('Compiler version set to 0.7.5. Latest version is')).toBeTruthy()
       expect(res.stdout.toString().trim().includes('Loading remote solc version v0.7.5+commit.eb77ed08 ...')).toBeTruthy()

libs/remix-tests/tests/testRunner.spec.ts

@@ -129,7 +129,7 @@ describe('testRunner', () => {
           { type: 'accountList', value: accounts },
           { type: 'contract', value: 'AssertOkTest', filename: __dirname + '/examples_0/assert_ok_test.sol' },
           { type: 'testPass', debugTxHash: '0x5b665752a4faf83229259b9b2811d3295be0af633b0051d4b90042283ef55707', value: 'Ok pass test', filename: __dirname + '/examples_0/assert_ok_test.sol', context: 'AssertOkTest', hhLogs: hhLogs1 },
-          { type: 'testFailure', debugTxHash: '0xa0a30ad042a7fc3495f72be7ba788d705888ffbbec7173f60bb27e07721510f2',value: 'Ok fail test', filename: __dirname + '/examples_0/assert_ok_test.sol', errMsg: 'okFailTest fails', context: 'AssertOkTest', hhLogs: hhLogs2, assertMethod: 'ok', location: '370:36:0', expected: 'true', returned: 'false'},
+          { type: 'testFailure', debugTxHash: '0xa0a30ad042a7fc3495f72be7ba788d705888ffbbec7173f60bb27e07721510f2',value: 'Ok fail test', filename: __dirname + '/examples_0/assert_ok_test.sol', errMsg: 'okFailTest fails', context: 'AssertOkTest', hhLogs: hhLogs2, assertMethod: 'ok', location: '368:36:0', expected: 'true', returned: 'false'},
           
         ], ['time', 'web3'])
       })