Skip to content

Commit c3bc10e

Browse files
author
jrdrew
committed
fix intellij and google fighting the styles
1 parent 74f6dbe commit c3bc10e

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ build/
66
!**/src/test/**/build/
77

88
### IntelliJ IDEA ###
9-
.idea/
9+
!.idea/
10+
.idea/*
11+
!.idea/google-java-format.xml
12+
!.idea/codeStyles/
13+
.idea/codeStyles/*
14+
!.idea/codeStyles/codeStyleConfig.xml
1015
*.iml
1116
*.ipr
1217
*.iws

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/google-java-format.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/int-test/java/com/example/app/AppIntegrationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.example.app;
22

3-
import nl.altindag.log.LogCaptor;
4-
import org.junit.jupiter.api.Test;
5-
63
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
74
import static org.junit.jupiter.api.Assertions.assertEquals;
85
import static org.junit.jupiter.api.Assertions.assertTrue;
96

7+
import nl.altindag.log.LogCaptor;
8+
import org.junit.jupiter.api.Test;
9+
1010
class AppIntegrationTest {
1111

1212
private final LogCaptor logCaptor = LogCaptor.forClass(App.class);

0 commit comments

Comments
 (0)