Skip to content

Commit 7cbd4a8

Browse files
JantherJanther
committed
adding tests for import directives
1 parent c900d61 commit 7cbd4a8

3 files changed

Lines changed: 123 additions & 3 deletions

File tree

‎tests/format/ImportDirective/ImportDirectives.sol‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,19 @@ import "SomeFile.sol" as SomeOtherFile;
33
import * as SomeSymbol from "AnotherFile.sol";
44
import {symbol1 as alias1, symbol2} from "File.sol";
55
import {symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4} from "File2.sol";
6+
import {
7+
GovernorVotesSuperQuorumFraction
8+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
9+
import {
10+
IAccessControl
11+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
12+
import {
13+
IERC7579Module,
14+
IERC7579Validator,
15+
IERC7579Execution,
16+
IERC7579AccountConfig,
17+
IERC7579ModuleConfig,
18+
MODULE_TYPE_VALIDATOR,
19+
MODULE_TYPE_EXECUTOR,
20+
MODULE_TYPE_FALLBACK
21+
} from "../../interfaces/draft-IERC7579.sol";

‎tests/format/ImportDirective/__snapshots__/format.test.js.snap‎

Lines changed: 106 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`ImportDirectives.sol - {"bracketSpacing":true} format 1`] = `
44
====================================options=====================================
@@ -12,7 +12,22 @@ import "SomeFile.sol" as SomeOtherFile;
1212
import * as SomeSymbol from "AnotherFile.sol";
1313
import {symbol1 as alias1, symbol2} from "File.sol";
1414
import {symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4} from "File2.sol";
15-
15+
import {
16+
GovernorVotesSuperQuorumFraction
17+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
18+
import {
19+
IAccessControl
20+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
21+
import {
22+
IERC7579Module,
23+
IERC7579Validator,
24+
IERC7579Execution,
25+
IERC7579AccountConfig,
26+
IERC7579ModuleConfig,
27+
MODULE_TYPE_VALIDATOR,
28+
MODULE_TYPE_EXECUTOR,
29+
MODULE_TYPE_FALLBACK
30+
} from "../../interfaces/draft-IERC7579.sol";
1631
=====================================output=====================================
1732
import "SomeFile.sol";
1833
import "SomeFile.sol" as SomeOtherFile;
@@ -24,12 +39,29 @@ import {
2439
symbol3 as alias3,
2540
symbol4
2641
} from "File2.sol";
42+
import {
43+
GovernorVotesSuperQuorumFraction
44+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
45+
import {
46+
IAccessControl
47+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
48+
import {
49+
IERC7579Module,
50+
IERC7579Validator,
51+
IERC7579Execution,
52+
IERC7579AccountConfig,
53+
IERC7579ModuleConfig,
54+
MODULE_TYPE_VALIDATOR,
55+
MODULE_TYPE_EXECUTOR,
56+
MODULE_TYPE_FALLBACK
57+
} from "../../interfaces/draft-IERC7579.sol";
2758
2859
================================================================================
2960
`;
3061

31-
exports[`ImportDirectives.sol format 1`] = `
62+
exports[`ImportDirectives.sol - {"compiler":"0.7.3"} format 1`] = `
3263
====================================options=====================================
64+
compiler: "0.7.3"
3365
parsers: ["slang"]
3466
printWidth: 80
3567
| printWidth
@@ -39,7 +71,62 @@ import "SomeFile.sol" as SomeOtherFile;
3971
import * as SomeSymbol from "AnotherFile.sol";
4072
import {symbol1 as alias1, symbol2} from "File.sol";
4173
import {symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4} from "File2.sol";
74+
import {
75+
GovernorVotesSuperQuorumFraction
76+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
77+
import {
78+
IAccessControl
79+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
80+
import {
81+
IERC7579Module,
82+
IERC7579Validator,
83+
IERC7579Execution,
84+
IERC7579AccountConfig,
85+
IERC7579ModuleConfig,
86+
MODULE_TYPE_VALIDATOR,
87+
MODULE_TYPE_EXECUTOR,
88+
MODULE_TYPE_FALLBACK
89+
} from "../../interfaces/draft-IERC7579.sol";
90+
=====================================output=====================================
91+
import "SomeFile.sol";
92+
import "SomeFile.sol" as SomeOtherFile;
93+
import * as SomeSymbol from "AnotherFile.sol";
94+
import {symbol1 as alias1, symbol2} from "File.sol";
95+
import {symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4} from "File2.sol";
96+
import {GovernorVotesSuperQuorumFraction} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
97+
import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
98+
import {IERC7579Module, IERC7579Validator, IERC7579Execution, IERC7579AccountConfig, IERC7579ModuleConfig, MODULE_TYPE_VALIDATOR, MODULE_TYPE_EXECUTOR, MODULE_TYPE_FALLBACK} from "../../interfaces/draft-IERC7579.sol";
4299
100+
================================================================================
101+
`;
102+
103+
exports[`ImportDirectives.sol format 1`] = `
104+
====================================options=====================================
105+
parsers: ["slang"]
106+
printWidth: 80
107+
| printWidth
108+
=====================================input======================================
109+
import "SomeFile.sol";
110+
import "SomeFile.sol" as SomeOtherFile;
111+
import * as SomeSymbol from "AnotherFile.sol";
112+
import {symbol1 as alias1, symbol2} from "File.sol";
113+
import {symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4} from "File2.sol";
114+
import {
115+
GovernorVotesSuperQuorumFraction
116+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
117+
import {
118+
IAccessControl
119+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
120+
import {
121+
IERC7579Module,
122+
IERC7579Validator,
123+
IERC7579Execution,
124+
IERC7579AccountConfig,
125+
IERC7579ModuleConfig,
126+
MODULE_TYPE_VALIDATOR,
127+
MODULE_TYPE_EXECUTOR,
128+
MODULE_TYPE_FALLBACK
129+
} from "../../interfaces/draft-IERC7579.sol";
43130
=====================================output=====================================
44131
import "SomeFile.sol";
45132
import "SomeFile.sol" as SomeOtherFile;
@@ -51,6 +138,22 @@ import {
51138
symbol3 as alias3,
52139
symbol4
53140
} from "File2.sol";
141+
import {
142+
GovernorVotesSuperQuorumFraction
143+
} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
144+
import {
145+
IAccessControl
146+
} from "@openzeppelin/contracts/access/IAccessControl.sol";
147+
import {
148+
IERC7579Module,
149+
IERC7579Validator,
150+
IERC7579Execution,
151+
IERC7579AccountConfig,
152+
IERC7579ModuleConfig,
153+
MODULE_TYPE_VALIDATOR,
154+
MODULE_TYPE_EXECUTOR,
155+
MODULE_TYPE_FALLBACK
156+
} from "../../interfaces/draft-IERC7579.sol";
54157
55158
================================================================================
56159
`;

‎tests/format/ImportDirective/format.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
runFormatTest(import.meta, ['slang']);
22
runFormatTest(import.meta, ['slang'], { bracketSpacing: true });
3+
runFormatTest(import.meta, ['slang'], { compiler: '0.7.3' });

0 commit comments

Comments
 (0)