Skip to content

Commit e7e37b2

Browse files
OJacot-DescombesOJacot-Descombes
committed
Applied ~100 suggested code fixes + 2 refactorings:
Code fixes: - Consecutive braces must not have blank line between them (1 x) - Convert to file-scoped namespace (~70 x) - Index can be simplified (1 x) - Mark assemblies with NeutralResourcesLanguageAttribute - Member 'xy' does not access instance data and can be marked as static (2 x) - Naming rule violation: Missing prefix: '_' (1 x) - Null check can be simplified (4 x) - Substring can be simplified (5 x) - Use framework type (~10 x) - Use pattern matching (1 x) - Use 'StringBuilder.Append(char)' instead of 'StringBuilder.Append(string)' (2 x) - Use 'switch' expression (2 x) - Using directives must be placed outside of a namespace declaration (3 x) Refactorings: - Convert to raw string (2 x)
1 parent 19af442 commit e7e37b2

File tree

79 files changed

+2976
-3080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2976
-3080
lines changed

‎JavaToCSharp.Tests/ConvertInterfaceTests.cs‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,65 @@
11
using System;
22
using Xunit;
33

4-
namespace JavaToCSharp.Tests
4+
namespace JavaToCSharp.Tests;
5+
6+
public class ConvertInterfaceTests
57
{
6-
public class ConvertInterfaceTests
8+
[Fact]
9+
public void Verify_Method_Param_Types_Use_New_Interface_Name_Types()
710
{
8-
[Fact]
9-
public void Verify_Method_Param_Types_Use_New_Interface_Name_Types()
10-
{
11-
var javaCode = @"import com.github.javaparser.resolution.Context;
12-
import com.github.javaparser.resolution.Test;
13-
public interface ResolvedType {
14-
default boolean isArray() {
15-
return false;
16-
}
17-
}
11+
var javaCode = """
12+
import com.github.javaparser.resolution.Context;
13+
import com.github.javaparser.resolution.Test;
14+
public interface ResolvedType {
15+
default boolean isArray() {
16+
return false;
17+
}
18+
}
1819
19-
public class InferenceVariableType implements ResolvedType {
20-
public void registerEquivalentType(ResolvedType type) {
21-
}
22-
}
23-
24-
public interface ResolvedValueDeclaration extends ResolvedDeclaration {
25-
ResolvedType getType();
26-
}
27-
";
28-
var options = new JavaConversionOptions { StartInterfaceNamesWithI = true };
29-
options.WarningEncountered += (_, eventArgs)
30-
=> Console.WriteLine("Line {0}: {1}", eventArgs.JavaLineNumber, eventArgs.Message);
31-
var parsed = JavaToCSharpConverter.ConvertText(javaCode, options);
32-
33-
var expectedCSharpCode = @"using Com.Github.Javaparser.Resolution;
34-
using System;
35-
using System.Collections.Generic;
36-
using System.Linq;
37-
using System.Text;
20+
public class InferenceVariableType implements ResolvedType {
21+
public void registerEquivalentType(ResolvedType type) {
22+
}
23+
}
3824
39-
namespace MyApp
40-
{
41-
public interface IResolvedType
42-
{
43-
bool IsArray();
44-
}
25+
public interface ResolvedValueDeclaration extends ResolvedDeclaration {
26+
ResolvedType getType();
27+
}
4528
46-
public class InferenceVariableType : IResolvedType
47-
{
48-
public virtual void RegisterEquivalentType(IResolvedType type)
49-
{
50-
}
51-
}
29+
""";
30+
var options = new JavaConversionOptions { StartInterfaceNamesWithI = true };
31+
options.WarningEncountered += (_, eventArgs)
32+
=> Console.WriteLine("Line {0}: {1}", eventArgs.JavaLineNumber, eventArgs.Message);
33+
var parsed = JavaToCSharpConverter.ConvertText(javaCode, options);
5234

53-
public interface IResolvedValueDeclaration
54-
{
55-
IResolvedType GetType();
56-
}
57-
}";
58-
59-
Assert.Equal(expectedCSharpCode, parsed);
60-
}
35+
var expectedCSharpCode = """
36+
using Com.Github.Javaparser.Resolution;
37+
using System;
38+
using System.Collections.Generic;
39+
using System.Linq;
40+
using System.Text;
41+
42+
namespace MyApp
43+
{
44+
public interface IResolvedType
45+
{
46+
bool IsArray();
47+
}
48+
49+
public class InferenceVariableType : IResolvedType
50+
{
51+
public virtual void RegisterEquivalentType(IResolvedType type)
52+
{
53+
}
54+
}
55+
56+
public interface IResolvedValueDeclaration
57+
{
58+
IResolvedType GetType();
59+
}
60+
}
61+
""";
6162

63+
Assert.Equal(expectedCSharpCode, parsed);
6264
}
6365
}

‎JavaToCSharp.Tests/ConvertTypeTests.cs‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
11
using Xunit;
22

3-
namespace JavaToCSharp.Tests
3+
namespace JavaToCSharp.Tests;
4+
5+
public class ConvertTypeTests
46
{
5-
public class ConvertTypeTests
7+
[Fact]
8+
public void ConvertType_Int()
9+
{
10+
Assert.Equal("int", TypeHelper.ConvertType("int"));
11+
}
12+
13+
[Fact]
14+
public void ConvertType_String()
15+
{
16+
Assert.Equal("string", TypeHelper.ConvertType("String"));
17+
}
18+
19+
[Fact]
20+
public void ConvertType_Object()
21+
{
22+
Assert.Equal("object", TypeHelper.ConvertType("Object"));
23+
}
24+
25+
[Fact]
26+
public void ConvertType_IntArray_BracketsAfterType()
27+
{
28+
Assert.Equal("int[]", TypeHelper.ConvertType("int[]"));
29+
}
30+
31+
[Fact]
32+
public void ConvertType_GenericSingleParameter()
33+
{
34+
Assert.Equal("MyType<string>", TypeHelper.ConvertType("MyType<String>"));
35+
}
36+
37+
[Fact]
38+
public void ConvertType_GenericMultipleParameters()
39+
{
40+
Assert.Equal("MyType<string, object>", TypeHelper.ConvertType("MyType<String, Object>"));
41+
}
42+
43+
[Fact]
44+
public void ConvertType_WithGenericWildcard_ShouldReplaceToken()
645
{
7-
[Fact]
8-
public void ConvertType_Int()
9-
{
10-
Assert.Equal("int", TypeHelper.ConvertType("int"));
11-
}
12-
13-
[Fact]
14-
public void ConvertType_String()
15-
{
16-
Assert.Equal("string", TypeHelper.ConvertType("String"));
17-
}
18-
19-
[Fact]
20-
public void ConvertType_Object()
21-
{
22-
Assert.Equal("object", TypeHelper.ConvertType("Object"));
23-
}
24-
25-
[Fact]
26-
public void ConvertType_IntArray_BracketsAfterType()
27-
{
28-
Assert.Equal("int[]", TypeHelper.ConvertType("int[]"));
29-
}
30-
31-
[Fact]
32-
public void ConvertType_GenericSingleParameter()
33-
{
34-
Assert.Equal("MyType<string>", TypeHelper.ConvertType("MyType<String>"));
35-
}
36-
37-
[Fact]
38-
public void ConvertType_GenericMultipleParameters()
39-
{
40-
Assert.Equal("MyType<string, object>", TypeHelper.ConvertType("MyType<String, Object>"));
41-
}
42-
43-
[Fact]
44-
public void ConvertType_WithGenericWildcard_ShouldReplaceToken()
45-
{
46-
Assert.Equal("MyType<TWildcardTodo>", TypeHelper.ConvertType("MyType<?>"));
47-
}
46+
Assert.Equal("MyType<TWildcardTodo>", TypeHelper.ConvertType("MyType<?>"));
4847
}
4948
}

‎JavaToCSharp.Tests/IntegrationTests.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using System;
22
using Xunit;
33

4-
namespace JavaToCSharp.Tests
4+
namespace JavaToCSharp.Tests;
5+
6+
public class IntegrationTests
57
{
6-
public class IntegrationTests
8+
[Theory]
9+
[InlineData("Resources/SimilarityBase.java")]
10+
[InlineData("Resources/TestNumericDocValuesUpdates.java")]
11+
public void TestCommentsCanBeConverted(string filePath)
712
{
8-
[Theory]
9-
[InlineData("Resources/SimilarityBase.java")]
10-
[InlineData("Resources/TestNumericDocValuesUpdates.java")]
11-
public void TestCommentsCanBeConverted(string filePath)
12-
{
13-
var options = new JavaConversionOptions();
14-
options.WarningEncountered += (_, eventArgs)
15-
=> Console.WriteLine("Line {0}: {1}", eventArgs.JavaLineNumber, eventArgs.Message);
16-
var parsed = JavaToCSharpConverter.ConvertText(System.IO.File.ReadAllText(filePath), options);
17-
Assert.NotNull(parsed);
18-
}
13+
var options = new JavaConversionOptions();
14+
options.WarningEncountered += (_, eventArgs)
15+
=> Console.WriteLine("Line {0}: {1}", eventArgs.JavaLineNumber, eventArgs.Message);
16+
var parsed = JavaToCSharpConverter.ConvertText(System.IO.File.ReadAllText(filePath), options);
17+
Assert.NotNull(parsed);
1918
}
2019
}

‎JavaToCSharp.Tests/VisitLiteralExpressionTests.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
using JavaToCSharp.Expressions;
33
using Xunit;
44

5-
namespace JavaToCSharp.Tests
5+
namespace JavaToCSharp.Tests;
6+
7+
public class VisitLiteralExpressionTests
68
{
7-
public class VisitLiteralExpressionTests
9+
[Fact]
10+
public void VisitLiteralExpression_Char()
811
{
9-
[Fact]
10-
public void VisitLiteralExpression_Char()
11-
{
12-
Assert.Equal("\n", ExpressionVisitor.VisitExpression(null, new CharLiteralExpr("\\n")).GetFirstToken().ValueText);
13-
}
12+
Assert.Equal("\n", ExpressionVisitor.VisitExpression(null, new CharLiteralExpr("\\n")).GetFirstToken().ValueText);
13+
}
1414

15-
[Fact]
16-
public void VisitLiteralExpression_String()
17-
{
18-
Assert.Equal("\\r", ExpressionVisitor.VisitExpression(null, new StringLiteralExpr("\\\\r")).GetFirstToken().ValueText);
19-
}
15+
[Fact]
16+
public void VisitLiteralExpression_String()
17+
{
18+
Assert.Equal("\\r", ExpressionVisitor.VisitExpression(null, new StringLiteralExpr("\\\\r")).GetFirstToken().ValueText);
2019
}
2120
}
2221

0 commit comments

Comments
 (0)