Merge pull request #29 from naver/ksmail13/fix/windows-test

Fix test example for windows
naver · Dec 29, 2020 · 7b61217 · 7b61217
2 parents ba42d22 + a70cae4
commit 7b61217
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@ jobs:
       shell: bash
       env:
         ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: java -jar ./cover-checker-console/target/cover-checker-console-1.4.0-jar-with-dependencies.jar -c ./cover-checker-cobertura/target/site/jacoco -c ./cover-checker-console/target/site/jacoco -c ./cover-checker-core/target/site/jacoco/ -c ./cover-checker-github/target/site/jacoco -c ./cover-checker-jacoco/target/site/jacoco -t 80 -r $GITHUB_REPOSITORY -g $ACCESS_TOKEN -p $(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
+      run: java -jar ./cover-checker-console/target/cover-checker-console-1.4.1-jar-with-dependencies.jar -c ./cover-checker-cobertura/target/site/jacoco -c ./cover-checker-console/target/site/jacoco -c ./cover-checker-core/target/site/jacoco/ -c ./cover-checker-github/target/site/jacoco -c ./cover-checker-jacoco/target/site/jacoco -t 80 -r $GITHUB_REPOSITORY -g $ACCESS_TOKEN -p $(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
   test-macos:
     runs-on: macos-latest
     steps:
@@ -32,13 +32,13 @@ jobs:
         java-version: 1.8
     - name: Build with Maven
       run: mvn clean package
-# test-window:
-#   runs-on: windows-latest
-#   steps:
-#   - uses: actions/checkout@v2
-#   - name: Set up JDK 1.8
-#     uses: actions/setup-java@v1
-#     with:
-#       java-version: 1.8
-#   - name: Build with Maven
-#     run: mvn clean package
+  test-window:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn clean package
diff --git a/cover-checker-cobertura/pom.xml b/cover-checker-cobertura/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>coverchecker</artifactId>
         <groupId>com.naver.nid</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cover-checker-console/pom.xml b/cover-checker-console/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>coverchecker</artifactId>
         <groupId>com.naver.nid</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cover-checker-core/pom.xml b/cover-checker-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>coverchecker</artifactId>
         <groupId>com.naver.nid</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cover-checker-github/pom.xml b/cover-checker-github/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>coverchecker</artifactId>
         <groupId>com.naver.nid</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...thub/src/test/java/com/naver/nid/cover/github/reporter/GithubPullRequestReporterTest.java b/...thub/src/test/java/com/naver/nid/cover/github/reporter/GithubPullRequestReporterTest.java
@@ -24,7 +24,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class GithubPullRequestReporterTest {
 
-	private static final String COMMENT_WITH_FILE = "#### [PR Coverage check]\n" +
+	private static final String COMMENT_WITH_FILE = ("#### [PR Coverage check]\n" +
 			"\n" +
 			":heart_eyes: **pass** : 2 / 3 (66.67%)\n" +
 			"\n" +
@@ -35,9 +35,9 @@ class GithubPullRequestReporterTest {
 			"|   |path|covered line|new line|coverage|\n" +
 			"|----|----|----|----|----|\n" +
 			"|:large_blue_circle:|test.java|50|100|50.00%|\n" +
-			"|:large_blue_circle:|test2.java|50|100|50.00%|\n\n\n";
+			"|:large_blue_circle:|test2.java|50|100|50.00%|\n\n\n").replace("\n", System.lineSeparator());
 
-	private static final String COMMENT_WITH_CONFUSE = "#### [PR Coverage check]\n" +
+	private static final String COMMENT_WITH_CONFUSE = ("#### [PR Coverage check]\n" +
 			"\n" +
 			":confused: **check** : 2 / 3 (66.67%)\n" +
 			"\n" +
@@ -48,19 +48,19 @@ class GithubPullRequestReporterTest {
 			"|   |path|covered line|new line|coverage|\n" +
 			"|----|----|----|----|----|\n" +
 			"|:large_blue_circle:|test.java|50|100|50.00%|\n" +
-			"|:red_circle:|test2.java|30|100|30.00%|\n\n\n";
+			"|:red_circle:|test2.java|30|100|30.00%|\n\n\n").replace("\n", System.lineSeparator());
 
-	private static final String COMMENT_WITHOUT_FILE = "#### [PR Coverage check]\n" +
+	private static final String COMMENT_WITHOUT_FILE = ("#### [PR Coverage check]\n" +
 			"\n\n" +
-			":heart_eyes: **pass** : 0 / 0 (0%)\n\n\n";
+			":heart_eyes: **pass** : 0 / 0 (0%)\n\n\n").replace("\n", System.lineSeparator());
 
-	private static final String COMMENT_ERROR = "#### [PR Coverage check]\n" +
+	private static final String COMMENT_ERROR = ("#### [PR Coverage check]\n" +
 			"\n" +
 			"coverage check fail. please retry. :fearful:\n" +
 			"\n" +
 			"[Please let me know](https://github.com/naver/cover-checker/issues/new) when error again.\n" +
 			"\n" +
-			"test error";
+			"test error").replace("\n", System.lineSeparator());
 
 	private GithubPullRequestManager mockPrManager;
 	private GithubCommentManager mockCommentManager;

diff --git a/cover-checker-jacoco/pom.xml b/cover-checker-jacoco/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>coverchecker</artifactId>
         <groupId>com.naver.nid</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.naver.nid</groupId>
     <artifactId>coverchecker</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <modules>
         <module>cover-checker-github</module>