added tests for TryStatement

src/main/java/org/jd/core/v1/model/javasyntax/statement/TryStatement.java

@@ -18,17 +18,14 @@ public class TryStatement implements Statement {
     private BaseStatement finallyStatements;
 
     public TryStatement(BaseStatement tryStatements, DefaultList<CatchClause> catchClauses, BaseStatement finallyStatements) {
-        this.resources = null;
-        this.tryStatements = tryStatements;
-        this.catchClauses = catchClauses;
-        this.finallyStatements = finallyStatements;
+        this(null, tryStatements, catchClauses, finallyStatements);
     }
 
     public TryStatement(DefaultList<Resource> resources, BaseStatement tryStatements, DefaultList<CatchClause> catchClauses, BaseStatement finallyStatements) {
         this.resources = resources;
-        this.tryStatements = tryStatements;
+        this.setTryStatements(tryStatements);
         this.catchClauses = catchClauses;
-        this.finallyStatements = finallyStatements;
+        this.setFinallyStatements(finallyStatements);
     }
 
     public DefaultList<Resource> getResources() {

src/test/java/org/jd/core/v1/model/javasyntax/statement/TryStatementTest.java

@@ -0,0 +1,116 @@
+package org.jd.core.v1.model.javasyntax.statement;
+
+import org.jd.core.v1.loader.ClassPathLoader;
+import org.jd.core.v1.model.javasyntax.expression.StringConstantExpression;
+import org.jd.core.v1.model.javasyntax.type.ObjectType;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.TestVisitor;
+import org.jd.core.v1.util.DefaultList;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TryStatementTest {
+
+    @Test
+    public void testResource() {
+        StringConstantExpression expression = new StringConstantExpression("test");
+        ObjectType type = ObjectType.TYPE_STRING;
+        TryStatement.Resource resource = new TryStatement.Resource(type, "resource1", expression);
+
+        assertEquals(type, resource.getType());
+        assertEquals("resource1", resource.getName());
+        assertEquals(expression, resource.getExpression());
+
+        StringConstantExpression newExpression = new StringConstantExpression("newTest");
+        resource.setExpression(newExpression);
+        assertEquals(newExpression, resource.getExpression());
+    }
+
+    @Test
+    public void testCatchClause() {
+        Statements statements = new Statements();
+        ObjectType type = ObjectType.TYPE_EXCEPTION;
+        TryStatement.CatchClause catchClause = new TryStatement.CatchClause(0, type, "exception", statements);
+
+        assertEquals(0, catchClause.getLineNumber());
+        assertEquals(type, catchClause.getType());
+        assertEquals("exception", catchClause.getName());
+        assertEquals(statements, catchClause.getStatements());
+
+        ObjectType otherType = ObjectType.TYPE_RUNTIME_EXCEPTION;
+        catchClause.addType(otherType);
+        assertEquals(1, catchClause.getOtherTypes().size());
+        assertEquals(otherType, catchClause.getOtherTypes().get(0));
+
+        assertFalse(catchClause.isFinal());
+        catchClause.setFinal(true);
+        assertTrue(catchClause.isFinal());
+    }
+
+    @Test
+    public void testTryStatement() {
+        Statements tryStatements = new Statements();
+        Statements finallyStatements = new Statements();
+        DefaultList<TryStatement.CatchClause> catchClauses = new DefaultList<>();
+        TryStatement tryStatement = new TryStatement(tryStatements, catchClauses, finallyStatements);
+
+        assertEquals(tryStatements, tryStatement.getTryStatements());
+        assertEquals(catchClauses, tryStatement.getCatchClauses());
+        assertEquals(finallyStatements, tryStatement.getFinallyStatements());
+
+        assertTrue(tryStatement.isTryStatement());
+
+        DefaultList<TryStatement.Resource> resources = new DefaultList<>();
+        StringConstantExpression expression = new StringConstantExpression("test");
+        ObjectType type = ObjectType.TYPE_STRING;
+        TryStatement.Resource resource = new TryStatement.Resource(type, "resource1", expression);
+        resources.add(resource);
+
+        TryStatement resourceTryStatement = new TryStatement(resources, tryStatements, catchClauses, finallyStatements);
+        assertEquals(resources, resourceTryStatement.getResources());
+    }
+
+    @Test
+    public void testAcceptMethods() {
+        // Create TypeMaker instance
+        TypeMaker typeMaker = new TypeMaker(new ClassPathLoader());
+
+        // Create resources
+        DefaultList<TryStatement.Resource> resources = new DefaultList<>();
+        StringConstantExpression expression = new StringConstantExpression("test");
+        resources.add(new TryStatement.Resource(typeMaker.makeFromInternalTypeName("ResourceType"), "resourceName", expression));
+
+        // Create catch clauses
+        DefaultList<TryStatement.CatchClause> catchClauses = new DefaultList<>();
+        catchClauses.add(new TryStatement.CatchClause(1, typeMaker.makeFromInternalTypeName("CatchClauseType"), "catchClauseName", new Statements()));
+
+        // Create try and finally statements
+        Statements tryStatements = new Statements();
+        Statements finallyStatements = new Statements();
+
+        // Create TryStatement
+        TryStatement tryStatement = new TryStatement(resources, tryStatements, catchClauses, finallyStatements);
+
+        // Create TestVisitor and accept it
+        TestVisitor visitor = new TestVisitor();
+        tryStatement.accept(visitor);
+
+        // Have each resource and catch clause accept the visitor
+        for (TryStatement.Resource resource : resources) {
+            resource.accept(visitor);
+        }
+
+        for (TryStatement.CatchClause catchClause : catchClauses) {
+            catchClause.accept(visitor);
+        }
+
+        // Check the counts
+        assertEquals(1, visitor.getTryStatementCount());
+        assertEquals(1, visitor.getResourceCount());
+        assertEquals(1, visitor.getCatchClauseCount());
+    }
+
+}