JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict
Some checks failed
Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 43s
Details

Browse Source
This commit is contained in:
Daniel Holle 2024-06-07 12:16:03 +02:00
parent 60a1f3b220
commit 091a6b8f1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/TestComplete.java
View File

@ -1134,17 +1134,17 @@ public class TestComplete {
} }
@Test @Test
<<<<<<< HEAD
public void testBug337() throws Exception { public void testBug337() throws Exception {
var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug337.jav"); var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug337.jav");
var clazz = classFiles.get("Bug337"); var clazz = classFiles.get("Bug337");
var instance = clazz.getDeclaredConstructor().newInstance(); var instance = clazz.getDeclaredConstructor().newInstance();
clazz.getDeclaredMethod("main").invoke(instance); clazz.getDeclaredMethod("main").invoke(instance);
======= }
@Test
public void testBug338() throws Exception { public void testBug338() throws Exception {
var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav"); var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav");
var clazz = classFiles.get("Bug338"); var clazz = classFiles.get("Bug338");
var instance = clazz.getDeclaredConstructor().newInstance(); var instance = clazz.getDeclaredConstructor().newInstance();
>>>>>>> ea217d16d5a1d635ac7fe961b98c2ad993c14ac5
} }
} }