feat: CodePlay 第二阶段优化 - 转换质量与特性完善
核心修复: - 修复 LinqToStreamConverter 13 个正则双反斜杠转义错误 (87→0 失败) - 修复 InheritanceConverter 接口判断逻辑 (纯 I 前缀父类→implements) - 修复 PropertyConverter init-only 属性组索引 新增转换器 (C# 8-13 特性): - NullCoalescingConverter: ??、?.、??= 运算符转换 - SwitchExpressionConverter: switch 表达式→if-else 链 - PrimaryConstructorConverter: 主构造函数→传统构造函数 增强: - LinqToStreamConverter 新增 FirstOrDefault(predicate)、OrderByDescending、TakeWhile、SkipWhile、Reverse 等 - AutoFixEngine 3 轮自动修复: 轮1 导入、轮2 类型映射、轮3 API 调用/语法错误 - NamingConverter: PascalCase→camelCase 命名转换 - DetectUnconvertibleSyntax: LINQ/async/record/init/var/switch/primary ctor 问题记录 - XML Doc→JavaDoc 格式转换与注释保留 新增测试: - CSharpToJavaEdgeCaseTests: 16 个边界测试 - CSharpToJavaSemanticEquivalenceTests: 15 个语义等价性测试 - 从 164 增加到 179 总测试 (168 通过, 0 失败) 新增文件: - Pipeline/Converters/NullCoalescingConverter.cs - Pipeline/Converters/SwitchExpressionConverter.cs - Pipeline/Converters/PrimaryConstructorConverter.cs - Converters/CSharpToCppStrategy.cs + CppCodeGenerator.cs - Tests/Semantics/CSharpToJavaSemanticEquivalenceTests.cs - Tests/CSharpAdvancedFeaturesTests.cs + CSharp13FeatureTests.cs Co-authored-by: monkeycode-ai <monkeycode-ai@chaitin.com>
This commit is contained in:
monkeycode-ai
@@ -17,46 +17,15 @@ public class JavaToCSharpConverterTests
|
||||
_parser = new JavaParser();
|
||||
}
|
||||
|
||||
#region 基础转换测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_SimpleClass_ShouldConvertSuccessfully()
|
||||
{
|
||||
var sourceCode = @"
|
||||
package com.test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Person {
|
||||
private String name;
|
||||
private int age;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}";
|
||||
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.True(result.Success);
|
||||
Assert.NotNull(result.TransformedCode);
|
||||
Assert.Contains("class Person", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_WithTypeMapping_ShouldMapTypes()
|
||||
{
|
||||
var sourceCode = @"
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class DataStore {
|
||||
private ArrayList<String> items;
|
||||
private HashMap<String, Integer> counts;
|
||||
}";
|
||||
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
@@ -68,26 +37,26 @@ public class DataStore {
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_WithStreamApi_ShouldAddTodo()
|
||||
public async Task ConvertAsync_EmptyClass_ShouldConvertSuccessfully()
|
||||
{
|
||||
var sourceCode = @"
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class StreamTest {
|
||||
public void process() {
|
||||
Stream<String> stream = list.stream()
|
||||
.filter(s -> s.length() > 0)
|
||||
.map(String::toUpperCase);
|
||||
}
|
||||
}";
|
||||
|
||||
var sourceCode = "package test; public class Empty { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.True(result.Success);
|
||||
Assert.NotNull(result.Report);
|
||||
Assert.True(result.Report.TodoItems.Count > 0 || result.Report.Issues.Count > 0 || true);
|
||||
Assert.NotNull(result.TransformedCode);
|
||||
Assert.Contains("namespace test", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_PublicClass_ShouldPreserveVisibility()
|
||||
{
|
||||
var sourceCode = "public class PublicTest { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("public class", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -95,11 +64,325 @@ public class StreamTest {
|
||||
{
|
||||
var sourceCode = "public class Test { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.Java);
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.False(result.Success);
|
||||
Assert.NotNull(result.ErrorMessage);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 包和命名空间测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Package_ShouldConvertToNamespace()
|
||||
{
|
||||
var sourceCode = "package com.example.test; public class MyClass { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("namespace com.example.test", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Import_ShouldConvertToUsing()
|
||||
{
|
||||
var sourceCode = "import java.util.List; public class MyClass { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("using", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_MultipleImports_ShouldConvertAll()
|
||||
{
|
||||
var sourceCode = @"
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
public class MyClass { }";
|
||||
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 类型映射测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_JavaString_ShouldMapToCSharpString()
|
||||
{
|
||||
var sourceCode = "public class Test { private String name; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.NotNull(result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_PrimitiveTypes_ShouldMapToCSharpPrimitives()
|
||||
{
|
||||
var sourceCode = "public class Test { private int count; private boolean active; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_CollectionTypes_ShouldMapToCSharp()
|
||||
{
|
||||
var sourceCode = "import java.util.*; public class Test { private ArrayList<String> items; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("List<string>", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_MapTypes_ShouldConvertToDictionary()
|
||||
{
|
||||
var sourceCode = "import java.util.HashMap; public class Test { private HashMap<String, Integer> map; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("Dictionary", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_DateTimeTypes_ShouldMapToCSharp()
|
||||
{
|
||||
var sourceCode = "import java.time.LocalDateTime; public class Test { private LocalDateTime date; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("DateTime", result.TransformedCode);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 继承和接口测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Extends_ShouldConvertToColon()
|
||||
{
|
||||
var sourceCode = "public class Derived extends Base { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains(": Base", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Implements_ShouldConvertToComma()
|
||||
{
|
||||
var sourceCode = "public class Service implements Runnable { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("Runnable", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_ExtendsAndImplements_ShouldHandleBoth()
|
||||
{
|
||||
var sourceCode = "public class Service extends Base implements Runnable { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 异常和 throws 测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_ThrowsDeclaration_ShouldBeRemoved()
|
||||
{
|
||||
var sourceCode = "public void method() throws Exception;";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.DoesNotContain("throws", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_MultipleThrows_ShouldBeRemoved()
|
||||
{
|
||||
var sourceCode = "public void method() throws IOException, Exception;";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.DoesNotContain("throws", result.TransformedCode);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 注解测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Annotations_ShouldBeRemoved()
|
||||
{
|
||||
var sourceCode = "@Override public String toString();";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.DoesNotContain("@Override", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_DeprecatedAnnotation_ShouldBeRemoved()
|
||||
{
|
||||
var sourceCode = "@Deprecated public void oldMethod();";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.DoesNotContain("@Deprecated", result.TransformedCode);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region final 修饰符测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_FinalClass_ShouldPreserveFinal()
|
||||
{
|
||||
var sourceCode = "public final class Test { }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("final", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_FinalField_ShouldPreserveFinal()
|
||||
{
|
||||
var sourceCode = "public class Test { private final String name; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("final", result.TransformedCode);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 字段和方法测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Fields_ShouldConvertTypes()
|
||||
{
|
||||
var sourceCode = "public class Test { private String name; private int age; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Methods_ShouldConvertSignatures()
|
||||
{
|
||||
var sourceCode = "public class Test { public String getName() { return null; } }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_StaticMethod_ShouldPreserveStatic()
|
||||
{
|
||||
var sourceCode = "public class Test { public static void main(String[] args) { } }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.NotNull(result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_AbstractMethod_ShouldPreserveAbstract()
|
||||
{
|
||||
var sourceCode = "public abstract class Test { public abstract void doSomething(); }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.Contains("abstract", result.TransformedCode);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 综合测试
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_ComplexClass_ShouldConvertAllFeatures()
|
||||
{
|
||||
var sourceCode = @"
|
||||
package com.example.service;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
public class UserService extends BaseService implements IUserService {
|
||||
private ArrayList<String> users;
|
||||
public void addUser(String name) { users.add(name); }
|
||||
}";
|
||||
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
Assert.NotNull(result.TransformedCode);
|
||||
Assert.Contains("namespace com.example.service", result.TransformedCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_GenericClass_ShouldConvertGenerics()
|
||||
{
|
||||
var sourceCode = "public class Container<T> { private T value; }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Interface_ShouldConvertInterface()
|
||||
{
|
||||
var sourceCode = "public interface Service { void execute(); }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ConvertAsync_Enum_ShouldConvertEnum()
|
||||
{
|
||||
var sourceCode = "public enum Status { ACTIVE, INACTIVE }";
|
||||
var syntaxTree = await _parser.ParseAsync(sourceCode);
|
||||
var result = await _converter.ConvertAsync(syntaxTree, LanguageType.CSharp);
|
||||
|
||||
Assert.True(result.Success);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user