Skip to content

Commit b010d8b

Browse files
chore: improve formatting and format checks (#803)
Co-authored-by: Yutaro Sakamoto <mail@yutaro-sakamoto.com>
1 parent 0c7ad0d commit b010d8b

3 files changed

Lines changed: 60 additions & 48 deletions

File tree

check-format

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
#!/bin/bash
2-
cd libcobj && ./gradlew spotlessCheck
3-
cd ../cobj && ./check-format
2+
set -e
3+
cd libcobj
4+
./gradlew spotlessCheck
5+
cd ../cobj
6+
./check-format

format

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
#!/bin/bash
2-
cd libcobj && ./gradlew spotlessApply
3-
cd ../cobj && ./format
2+
set -e
3+
cd libcobj
4+
./gradlew spotlessApply
5+
cd ../cobj
6+
./format

libcobj/app/src/test/java/jp/osscons/opensourcecobol/libcobj/call/CobolResolveTest.java

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -144,70 +144,76 @@ void testCancelWithNullName() {
144144

145145
@Test
146146
void testPushAndPopCallStackList() {
147-
assertDoesNotThrow(() -> {
148-
CobolResolve.pushCallStackList("PROGRAM1");
149-
CobolResolve.pushCallStackList("PROGRAM2");
150-
CobolResolve.popCallStackList();
151-
CobolResolve.popCallStackList();
152-
});
147+
assertDoesNotThrow(
148+
() -> {
149+
CobolResolve.pushCallStackList("PROGRAM1");
150+
CobolResolve.pushCallStackList("PROGRAM2");
151+
CobolResolve.popCallStackList();
152+
CobolResolve.popCallStackList();
153+
});
153154
}
154155

155156
@Test
156157
void testPushCallStackListSameName() {
157-
assertDoesNotThrow(() -> {
158-
CobolResolve.pushCallStackList("PROGRAM1");
159-
CobolResolve.pushCallStackList("PROGRAM1");
160-
CobolResolve.popCallStackList();
161-
CobolResolve.popCallStackList();
162-
});
158+
assertDoesNotThrow(
159+
() -> {
160+
CobolResolve.pushCallStackList("PROGRAM1");
161+
CobolResolve.pushCallStackList("PROGRAM1");
162+
CobolResolve.popCallStackList();
163+
CobolResolve.popCallStackList();
164+
});
163165
}
164166

165167
@Test
166168
void testPushCallStackListMultipleSiblings() {
167-
assertDoesNotThrow(() -> {
168-
CobolResolve.pushCallStackList("PROGRAM1");
169-
CobolResolve.popCallStackList();
170-
CobolResolve.pushCallStackList("PROGRAM2");
171-
CobolResolve.popCallStackList();
172-
CobolResolve.pushCallStackList("PROGRAM3");
173-
CobolResolve.popCallStackList();
174-
});
169+
assertDoesNotThrow(
170+
() -> {
171+
CobolResolve.pushCallStackList("PROGRAM1");
172+
CobolResolve.popCallStackList();
173+
CobolResolve.pushCallStackList("PROGRAM2");
174+
CobolResolve.popCallStackList();
175+
CobolResolve.pushCallStackList("PROGRAM3");
176+
CobolResolve.popCallStackList();
177+
});
175178
}
176179

177180
@Test
178181
void testPushCallStackListDeepNesting() {
179-
assertDoesNotThrow(() -> {
180-
CobolResolve.pushCallStackList("LEVEL1");
181-
CobolResolve.pushCallStackList("LEVEL2");
182-
CobolResolve.pushCallStackList("LEVEL3");
183-
CobolResolve.pushCallStackList("LEVEL4");
184-
CobolResolve.popCallStackList();
185-
CobolResolve.popCallStackList();
186-
CobolResolve.popCallStackList();
187-
CobolResolve.popCallStackList();
188-
});
182+
assertDoesNotThrow(
183+
() -> {
184+
CobolResolve.pushCallStackList("LEVEL1");
185+
CobolResolve.pushCallStackList("LEVEL2");
186+
CobolResolve.pushCallStackList("LEVEL3");
187+
CobolResolve.pushCallStackList("LEVEL4");
188+
CobolResolve.popCallStackList();
189+
CobolResolve.popCallStackList();
190+
CobolResolve.popCallStackList();
191+
CobolResolve.popCallStackList();
192+
});
189193
}
190194

191195
@Test
192196
void testPushCallStackListMixedPattern() {
193-
assertDoesNotThrow(() -> {
194-
CobolResolve.pushCallStackList("MAIN");
195-
CobolResolve.pushCallStackList("SUB1");
196-
CobolResolve.popCallStackList();
197-
CobolResolve.pushCallStackList("SUB2");
198-
CobolResolve.pushCallStackList("SUB2A");
199-
CobolResolve.popCallStackList();
200-
CobolResolve.popCallStackList();
201-
CobolResolve.popCallStackList();
202-
});
197+
assertDoesNotThrow(
198+
() -> {
199+
CobolResolve.pushCallStackList("MAIN");
200+
CobolResolve.pushCallStackList("SUB1");
201+
CobolResolve.popCallStackList();
202+
CobolResolve.pushCallStackList("SUB2");
203+
CobolResolve.pushCallStackList("SUB2A");
204+
CobolResolve.popCallStackList();
205+
CobolResolve.popCallStackList();
206+
CobolResolve.popCallStackList();
207+
});
203208
}
204209

205210
@Test
206211
void testPopCallStackListOnEmpty() {
207-
assertDoesNotThrow(() -> {
208-
CobolResolve.popCallStackList();
209-
CobolResolve.popCallStackList();
210-
});
212+
assertDoesNotThrow(
213+
() -> {
214+
CobolResolve.popCallStackList();
215+
CobolResolve.popCallStackList();
216+
});
211217
}
212218

213219
@Test

0 commit comments

Comments
 (0)