Skip to content

Commit

Permalink
added more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nbauma109 committed May 12, 2023
1 parent d0a88fe commit 5005a72
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/TypeMaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ private BaseTypeParameter parseTypeParameters(SignatureReader reader) {
* ClassBound: ':' FieldTypeSignature?
* InterfaceBound: ':' FieldTypeSignature
*/
private TypeParameter parseTypeParameter(SignatureReader reader) {
TypeParameter parseTypeParameter(SignatureReader reader) {
int fistIndex = reader.index;

// Search ':'
Expand Down Expand Up @@ -649,7 +649,7 @@ private Type parseReferenceTypeSignature(String signature) {
* BaseType: 'B' | 'C' | 'D' | 'F' | 'I' | 'J' | 'S' | 'Z'
* TypeVariableSignature: 'T' Identifier ';'
*/
private Type parseReferenceTypeSignature(SignatureReader reader) {
Type parseReferenceTypeSignature(SignatureReader reader) {
if (reader.available()) {
int dimension = 0;
char c = reader.read();
Expand Down
8 changes: 0 additions & 8 deletions ...java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/SignatureReaderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ public void testAvailable() {
Assert.assertFalse(signatureReader.available());
}

@Test
public void testSubstring() {
signatureReader.read(); // Move index
Assert.assertEquals("Ljava", signatureReader.substring(1));
signatureReader.read(); // Move index
Assert.assertEquals("va", signatureReader.substring(2));
}

@Test
public void testToString() {
Assert.assertEquals("SignatureReader{index=0, nextChars=Ljava/lang/String;}", signatureReader.toString());
Expand Down
106 changes: 105 additions & 1 deletion src/test/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/TypeMakerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@

import org.apache.commons.collections4.iterators.AbstractUntypedIteratorDecorator;
import org.jd.core.v1.loader.ClassPathLoader;
import org.jd.core.v1.model.javasyntax.type.GenericType;
import org.jd.core.v1.model.javasyntax.type.ObjectType;
import org.jd.core.v1.model.javasyntax.type.PrimitiveType;
import org.jd.core.v1.model.javasyntax.type.Type;
import org.jd.core.v1.model.javasyntax.type.TypeArguments;
import org.jd.core.v1.model.javasyntax.type.TypeParameter;
import org.jd.core.v1.model.javasyntax.type.TypeParameterWithTypeBounds;
import org.jd.core.v1.model.javasyntax.type.WildcardExtendsTypeArgument;
import org.jd.core.v1.model.javasyntax.type.WildcardSuperTypeArgument;
import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker.SignatureReader;
Expand Down Expand Up @@ -439,7 +444,6 @@ public void testParseClassTypeSignature() {
typeMaker.parseClassTypeSignature(new SignatureReader("Ljava/util/Map.Entry<Ljava/lang/String;Ljava/lang/Integer;;"), 0));
}


@Test
public void testIsAReferenceTypeSignature() {
// Test when reader is empty
Expand All @@ -459,4 +463,104 @@ public void testIsAReferenceTypeSignature() {
assertFalse(typeMaker.isAReferenceTypeSignature(new SignatureReader("X")));
}

@Test
public void testParseReferenceTypeSignature() {
// ClassTypeSignature
assertObjectType("Ljava/lang/String;", "java.lang.String", 0);

// ArrayTypeSignature - for each primitive type
assertObjectType("[I", "int", 1);
assertObjectType("[J", "long", 1);
assertObjectType("[Z", "boolean", 1);
assertObjectType("[B", "byte", 1);
assertObjectType("[C", "char", 1);
assertObjectType("[D", "double", 1);
assertObjectType("[F", "float", 1);
assertObjectType("[S", "short", 1);

// PrimitiveTypeSignatures
assertPrimitiveType("I", "int", 0);
assertPrimitiveType("J", "long", 0);
assertPrimitiveType("Z", "boolean", 0);
assertPrimitiveType("B", "byte", 0);
assertPrimitiveType("C", "char", 0);
assertPrimitiveType("D", "double", 0);
assertPrimitiveType("F", "float", 0);
assertPrimitiveType("S", "short", 0);

// TypeVariableSignature
assertGenericType("TT;", "T", 0);

// Case where ';' is not found for a TypeVariableSignature
SignatureReader reader = new SignatureReader("TIdentifier");
Type result = typeMaker.parseReferenceTypeSignature(reader);
assertNull(result);

// Case where BaseType is 'V'
reader = new SignatureReader("V");
result = typeMaker.parseReferenceTypeSignature(reader);
assertTrue(result instanceof PrimitiveType);
assertEquals("void", ((PrimitiveType) result).getName());

// Case where c is not any of the expected BaseType or ClassType
reader = new SignatureReader("X");
result = typeMaker.parseReferenceTypeSignature(reader);
assertNull(result);

// Case where SignatureReader has no more characters available
reader = new SignatureReader("");
result = typeMaker.parseReferenceTypeSignature(reader);
assertNull(result);
}

private void assertObjectType(String signature, String expectedQualifiedName, int expectedDimension) {
SignatureReader reader = new SignatureReader(signature);
Type result = typeMaker.parseReferenceTypeSignature(reader);
assertTrue(result instanceof ObjectType);
assertEquals(expectedQualifiedName, ((ObjectType) result).getQualifiedName());
assertEquals(expectedDimension, result.getDimension());
}

private void assertPrimitiveType(String signature, String expectedName, int expectedDimension) {
SignatureReader reader = new SignatureReader(signature);
Type result = typeMaker.parseReferenceTypeSignature(reader);
assertTrue(result instanceof PrimitiveType);
assertEquals(expectedName, ((PrimitiveType) result).getName());
assertEquals(expectedDimension, result.getDimension());
}

private void assertGenericType(String signature, String expectedName, int expectedDimension) {
SignatureReader reader = new SignatureReader(signature);
Type result = typeMaker.parseReferenceTypeSignature(reader);
assertTrue(result instanceof GenericType);
assertEquals(expectedName, ((GenericType) result).getName());
assertEquals(expectedDimension, result.getDimension());
}

@Test
public void testParseTypeParameter() {
// Case: TypeParameter with no bounds
SignatureReader reader = new SignatureReader("T:");
TypeParameter result = typeMaker.parseTypeParameter(reader);
assertEquals("T", result.getIdentifier());
assertTrue(result instanceof TypeParameter);

// Case: TypeParameter with a single ClassBound
reader = new SignatureReader("T:Ljava/lang/String;");
result = typeMaker.parseTypeParameter(reader);
assertEquals("T", result.getIdentifier());
assertTrue(result instanceof TypeParameterWithTypeBounds);
assertEquals("java.lang.String", ((ObjectType) ((TypeParameterWithTypeBounds) result).getTypeBounds()).getQualifiedName());

// Case: TypeParameter with multiple InterfaceBounds
reader = new SignatureReader("T::Ljava/lang/Runnable;:Ljava/lang/Serializable;");
result = typeMaker.parseTypeParameter(reader);
assertEquals("T", result.getIdentifier());
assertTrue(result instanceof TypeParameterWithTypeBounds);
// Assuming getTypeBounds() returns a BaseType collection, and it can have multiple bounds
assertEquals(2, ((TypeParameterWithTypeBounds) result).getTypeBounds().size());
assertEquals("java.lang.Runnable", ((ObjectType) ((TypeParameterWithTypeBounds) result).getTypeBounds().getFirst()).getQualifiedName());
assertEquals("java.lang.Serializable", ((ObjectType) ((TypeParameterWithTypeBounds) result).getTypeBounds().getLast()).getQualifiedName());
}

}

0 comments on commit 5005a72

Please sign in to comment.