Skip to content

Commit

Permalink
Merge pull request apache#7910 from sid-srini/fix_tests_crlf_mismatch…
Browse files Browse the repository at this point in the history 
…_windows

Fix tests failure due to CRLF mismatch on Windows in java.hints, java.source.base
  • Loading branch information
@mbien
mbien authored Oct 29, 2024
2 parents 2eecf2a + f7fe71f commit 635860e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@

# Define some file types explicitly as being binary.
*.jar binary

# Define rules for files in specific paths, such as test data,
# for line endings, binary types etc.
java/java.hints/test/unit/data/goldenfiles/** text eol=lf
2 changes: 1 addition & 1 deletion ....hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ protected String performFixTest(String fileName, String code, int pos, String er
String realCode = toCheckDocument.getText(0, toCheckDocument.getLength());

//ignore whitespaces:
realCode = realCode.replaceAll("[ \t\n]+", " ");
realCode = realCode.replaceAll("\\s+", " ");

if (golden != null) {
assertEquals("The output code does not match the expected code.", golden, realCode);
Expand Down
27 changes: 27 additions & 0 deletions ...ase/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ public void testPreserveValidMethods1() throws Exception {
" System.err.println(\"Hello, world!\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -729,6 +730,7 @@ public void testClearInvalidMethod() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code - compiler.err.cant.resolve.location\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -792,6 +794,7 @@ public void testPreserveValidInitializers() throws Exception {
" private int F5a;\n" +
" private int F5b;\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -834,6 +837,7 @@ public void testBrokenClassHeader1() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -883,6 +887,7 @@ public void testNullReturnUnknown() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -932,6 +937,7 @@ public void testBrokenNewClass() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -983,6 +989,7 @@ public void testReturnBroken() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1037,6 +1044,7 @@ public void testAssertBroken() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1117,6 +1125,7 @@ public void testAnonymousComplex() throws Exception {
" };\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1165,6 +1174,7 @@ public void testFieldInit() throws Exception {
" super();\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1239,6 +1249,7 @@ public void testAnonymousComplex2() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1285,6 +1296,7 @@ public void testNewClass() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code - compiler.err.cant.apply.symbol\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1336,6 +1348,7 @@ public void testUndefNewArray() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1412,6 +1425,7 @@ public void testUndefAnonymous() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1471,6 +1485,7 @@ public void testWeirdSuperCall() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1590,6 +1605,7 @@ public void testAnonymousComplex3() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1690,6 +1706,7 @@ public void testAnonymousComplex4() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code - compiler.err.cant.resolve.location.args\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1763,6 +1780,7 @@ public void testAnonymousComplexCorrect() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1806,6 +1824,7 @@ public void testWarningsAreNotErrors() throws Exception {
" }\n" +
" Test t;\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1878,6 +1897,7 @@ public void testSuperCall() throws Exception {
" public default void test2() {\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -1923,6 +1943,7 @@ public void testStaticInit() throws Exception {
" System.err.println();\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2161,6 +2182,7 @@ public void testMethodWithErroneousInMemberRef() throws Exception {
" \n" +
" public Object test(Object o);\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2242,6 +2264,7 @@ public void testPatternSwitch() throws Exception {
" throw new java.lang.RuntimeException(\"Uncompilable code\");\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2294,6 +2317,7 @@ public void testTypeTest() throws Exception {
" }\n" +
" }\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2339,6 +2363,7 @@ public void testWrongRecordComponent() throws Exception {
" }\n" +
" private final int wait;\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2391,6 +2416,7 @@ public void testRecord1() throws Exception {
" }\n" +
" private final int i;\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down Expand Up @@ -2428,6 +2454,7 @@ public void testRecord2() throws Exception {
" }\n" +
" private final int i;\n" +
"}");
if (!"\n".equals(System.lineSeparator())) file2Fixed.replaceAll((k, v) -> v.replaceAll(System.lineSeparator(), "\n"));
assertEquals(expected, file2Fixed);
}

Expand Down

0 comments on commit 635860e

Please sign in to comment.