Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Commit

Permalink
Move tests to the src directory and use absolute import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
FastAlien committed May 14, 2023
1 parent 2e67ad2 commit 76aaa6f
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 20 deletions.
7 changes: 6 additions & 1 deletion jest.config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"preset": "ts-jest"
"preset": "ts-jest",
"rootDir": "src",
"moduleDirectories": [
"node_modules",
"src"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ArgumentParser, {ParseResult} from "../../../src/cli/ArgumentParser";
import {OptionArgumentExpectedError, UnknownArgumentError, UnknownOptionError} from "../../../src/cli/Errors";
import ArgumentParser, {ParseResult} from "./ArgumentParser";
import {OptionArgumentExpectedError, UnknownArgumentError, UnknownOptionError} from "./Errors";

describe("ArgumentParser with one argument", () => {
const parser = new ArgumentParser({programName: "test", description: "Test application"});
Expand Down
6 changes: 3 additions & 3 deletions test/unit/cli/Cli.test.ts → src/cli/Cli.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fs from "fs";
import os from "os";
import {Writable} from "stream";
import Cli from "../../../src/cli/Cli";
import CliError, {ErrorCode} from "../../../src/cli/CliError";
import Cli from "./Cli";
import CliError, {ErrorCode} from "./CliError";

const fileEncoding = "utf-8";

Expand Down Expand Up @@ -43,7 +43,7 @@ describe("Parse correct arguments", () => {
const includeDirectory = `${dataDirectory}/include`;
const sourceDirectory = `${dataDirectory}/src`;
const inputFilePath = `${dataDirectory}/main.cpp`;
const helpFilePath = "test/unit/cli/help.txt";
const helpFilePath = "test/data/cli/help.txt";

test("When no arguments and options are passed, then help text is displayed on stdout", () => {
const output = new StringWritableStream();
Expand Down
4 changes: 2 additions & 2 deletions src/cli/Cli.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from "fs";
import {Writable} from "stream";
import CppFileMerger from "../parse/CppFileMerger";
import {ParseError} from "../parse/Errors";
import CppFileMerger from "parse/CppFileMerger";
import {ParseError} from "parse/Errors";
import ArgumentParser from "./ArgumentParser";
import CliError, {ErrorCode} from "./CliError";
import {ArgumentError, UnknownArgumentError, UnknownOptionError} from "./Errors";
Expand Down
2 changes: 1 addition & 1 deletion src/cli/Errors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {TraceError} from "../common/TraceError";
import {TraceError} from "common/TraceError";

export class ArgumentError extends TraceError {
public readonly argument: string;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/HelpFormatter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {EOL} from "os";
import {limitLineLength} from "../common/StringUtils";
import {limitLineLength} from "common/StringUtils";
import {Argument, Option} from "./Types";

export default class HelpFormatter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {EOL} from "os";
import {limitLineLength} from "../../../src/common/StringUtils";
import {limitLineLength} from "./StringUtils";

describe("limitLineWidth", () => {
const text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from "fs";
import CppFileMerger from "../../../src/parse/CppFileMerger";
import {IncludeFileNotFoundError} from "../../../src/parse/Errors";
import CppFileMerger from "./CppFileMerger";
import {IncludeFileNotFoundError} from "./Errors";

describe("Parsing source file with missing include file", () => {
const merger = new CppFileMerger();
Expand Down
2 changes: 1 addition & 1 deletion src/parse/CppFileMerger.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from "path";
import {EOL} from "os";
import {removeDoubleEmptyLines} from "../common/StringUtils";
import {removeDoubleEmptyLines} from "common/StringUtils";
import CppFileParser from "./CppFileParser";
import {IncludeFileNotFoundError} from "./Errors";
import {findFile, readFile} from "./FileUtils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from "fs";
import CppFileParser from "../../../src/parse/CppFileParser";
import CppFileParser from "./CppFileParser";

const parser = new CppFileParser();

Expand Down
4 changes: 2 additions & 2 deletions src/parse/Errors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {TraceError} from "../common/TraceError";
import {ErrorCause} from "../common/Types";
import {TraceError} from "common/TraceError";
import {ErrorCause} from "common/Types";

export class ParseError extends TraceError {
public readonly file: string;
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"extends": "@tsconfig/node10/tsconfig.json",
"compilerOptions": {
"baseUrl": "src",
"baseUrl": "./src",
"declaration": true,
"sourceMap": true,
"outDir": "lib"
},
"include": [
"src/**/*"
"exclude": [
"**/*.test.ts"
]
}

0 comments on commit 76aaa6f

Please sign in to comment.