Skip to content

Fix Netbeans tests failures #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Fix Netbeans tests failures #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
patches/7722.diff
patches/7724.diff
patches/7733.diff
patches/7910.diff
patches/mvn-sh.diff
patches/generate-dependencies.diff
patches/rename-debugger.diff
Expand Down
249 changes: 249 additions & 0 deletions patches/7910.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
diff --git a/.gitattributes b/.gitattributes
index b96c7fd985..7c9b72b889 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
index ede2a586e888..a351d52bd5fc 100644
--- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
+++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
@@ -242,9 +242,11 @@ 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) {
+ //ignore CRLF/LF differences in golden:
+ if (!"\n".equals(System.lineSeparator())) golden = golden.replaceAll(System.lineSeparator(), " ");
assertEquals("The output code does not match the expected code.", golden, realCode);
}

diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
index bcd1c07c8701..fb4f11400726 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

@@ -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);
}

32 changes: 31 additions & 1 deletion patches/rename-debugger.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ index 87ec97a64b..781f97f44e 100644
public final class AttachConfigurations {

- static final String CONFIG_TYPE = "java+"; // NOI18N
+ static final String CONFIG_TYPE = "jdk"; // NOI18N
+ public static final String CONFIG_TYPE = "jdk"; // NOI18N
static final String CONFIG_REQUEST = "attach"; // NOI18N

static final RequestProcessor RP = new RequestProcessor(AttachConfigurations.class);
Expand All @@ -26,3 +26,33 @@ index 91bf8e30db..6d9a77e63a 100644

@Override
public CompletableFuture<List<CompletionItem>> configurations(Supplier<CompletableFuture<Project>> projectSupplier) {
diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
index 4fce71a094..2b6362ce37 100644
--- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
+++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
@@ -177,6 +177,7 @@ import org.netbeans.api.sendopts.CommandLine;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.hints.infrastructure.JavaErrorProvider;
import org.netbeans.modules.java.lsp.server.TestCodeLanguageClient;
+import org.netbeans.modules.java.lsp.server.debugging.attach.AttachConfigurations;
import org.netbeans.modules.java.lsp.server.input.QuickPickItem;
import org.netbeans.modules.java.lsp.server.input.ShowQuickPickParams;
import org.netbeans.modules.java.lsp.server.input.ShowInputBoxParams;
@@ -1223,7 +1224,7 @@ public class ServerTest extends NbTestCase {
}

private void checkAttachToPort(DebugConnector c) {
- assertEquals("java+", c.getType());
+ assertEquals(AttachConfigurations.CONFIG_TYPE, c.getType());
List<String> arguments = c.getArguments();
assertEquals(2, arguments.size());
assertEquals("hostName", arguments.get(0));
@@ -1232,7 +1233,7 @@ public class ServerTest extends NbTestCase {
}

private void checkAttachToProcess(DebugConnector c) {
- assertEquals("java+", c.getType());
+ assertEquals(AttachConfigurations.CONFIG_TYPE, c.getType());
List<String> arguments = c.getArguments();
assertEquals(1, arguments.size());
assertEquals("processId", arguments.get(0));