From 70b638dbe9d230459a49def3722a7a198b624445 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Sat, 5 Sep 2020 13:04:26 +0200 Subject: [PATCH] Github/GitLab test: Try to guess where the test data is The env in the CI seems to be a bit different --- test/apis/github_test.dart | 14 +++++++++++++- test/apis/gitlab_test.dart | 14 +++++++++++++- test/markdown_bug_test.dart | 3 +-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/test/apis/github_test.dart b/test/apis/github_test.dart index f0388efd..53f3406f 100644 --- a/test/apis/github_test.dart +++ b/test/apis/github_test.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:path/path.dart'; import 'package:test/test.dart'; import 'package:gitjournal/apis/githost_factory.dart'; @@ -9,7 +10,18 @@ import 'package:gitjournal/apis/github.dart'; void main() { test('Parse json', () async { print("Current Dir: ${Directory.current}"); - var jsonString = File('test/apis/data/github.json').readAsStringSync(); + var testDataPath = ''; + + var currentDir = Directory.current; + var folderName = basename(currentDir.path); + + if (folderName == 'test') { + testDataPath = join(currentDir.path, 'apis/data/github.json'); + } else { + testDataPath = join(currentDir.path, 'test/apis/data/github.json'); + } + + var jsonString = File(testDataPath).readAsStringSync(); var api = GitHub(); diff --git a/test/apis/gitlab_test.dart b/test/apis/gitlab_test.dart index 62817930..a6ffecfe 100644 --- a/test/apis/gitlab_test.dart +++ b/test/apis/gitlab_test.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:path/path.dart'; import 'package:test/test.dart'; import 'package:gitjournal/apis/githost_factory.dart'; @@ -9,7 +10,18 @@ import 'package:gitjournal/apis/gitlab.dart'; void main() { test('Parse json', () async { print("Current Dir: ${Directory.current}"); - var jsonString = File('test/apis/data/gitlab.json').readAsStringSync(); + var testDataPath = ''; + + var currentDir = Directory.current; + var folderName = basename(currentDir.path); + + if (folderName == 'test') { + testDataPath = join(currentDir.path, 'apis/data/gitlab.json'); + } else { + testDataPath = join(currentDir.path, 'test/apis/data/gitlab.json'); + } + + var jsonString = File(testDataPath).readAsStringSync(); var api = GitLab(); diff --git a/test/markdown_bug_test.dart b/test/markdown_bug_test.dart index b5b6dcc4..10febde9 100644 --- a/test/markdown_bug_test.dart +++ b/test/markdown_bug_test.dart @@ -22,9 +22,8 @@ SOFTWARE. */ -import 'package:test/test.dart'; - import 'package:markdown/markdown.dart' as md; +import 'package:test/test.dart'; /// Parse [[term]] class _WikiLinkSyntax extends md.InlineSyntax {