[jboss-cvs] JBossAS SVN: r106146 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 18 00:04:47 EDT 2010
Author: jeff.zhang
Date: 2010-06-18 00:04:46 -0400 (Fri, 18 Jun 2010)
New Revision: 106146
Modified:
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
Log:
[JBJCA-356] adjust Arquillian testcase layout
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2010-06-18 03:36:16 UTC (rev 106145)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2010-06-18 04:04:46 UTC (rev 106146)
@@ -54,14 +54,14 @@
writeIndent(out, indent);
out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
writeEol(out);
- writeIndent(out, indent);
- out.write("private static final String JNDI_PREFIX = \"java:/eis/\";");
writeEol(out);
writeIndent(out, indent);
- out.write("private static String deploymentName = null;");
+ out.write("private static String deploymentName = \"" + getClassName(def) + "\";");
writeEol(out);
+ writeEol(out);
writeDeployment(def, out, indent);
+ writeResource(def, out, indent);
if (def.isDefineMethodInConnection())
{
@@ -87,12 +87,17 @@
writeEol(out);
out.write("import java.util.UUID;");
writeEol(out);
+ writeEol(out);
+ out.write("import javax.annotation.Resource;");
+ writeEol(out);
+ writeEol(out);
out.write("import javax.naming.Context;");
writeEol(out);
out.write("import javax.naming.InitialContext;");
writeEol(out);
out.write("import javax.naming.NamingException;");
writeEol(out);
+ writeEol(out);
out.write("import org.jboss.arquillian.api.Deployment;");
writeEol(out);
out.write("import org.jboss.arquillian.junit.Arquillian;");
@@ -159,11 +164,8 @@
writeIndent(out, indent);
out.write("public static ResourceAdapterArchive createDeployment()");
writeLeftCurlyBracket(out, indent);
-
+
writeIndent(out, indent + 1);
- out.write("deploymentName = UUID.randomUUID().toString();");
- writeEol(out);
- writeIndent(out, indent + 1);
out.write("ResourceAdapterArchive raa =");
writeEol(out);
writeIndent(out, indent + 2);
@@ -208,13 +210,35 @@
}
writeIndent(out, indent + 1);
out.write("return raa;");
- writeEol(out);
writeRightCurlyBracket(out, indent);
writeEol(out);
}
/**
+ * Output resource for conection factory
+ * @param def definition
+ * @param out Writer
+ * @param indent space number
+ * @throws IOException ioException
+ */
+ private void writeResource(Definition def, Writer out, int indent) throws IOException
+ {
+ writeIndent(out, indent);
+ out.write("/** resource */");
+ writeEol(out);
+ writeIndent(out, indent);
+ out.write("@Resource(mappedName = \"java:/eis/" + getClassName(def) + "\")");
+ writeEol(out);
+ writeIndent(out, indent);
+ if (def.isDefineMethodInConnection())
+ out.write("private " + def.getCfInterfaceClass() + " connectionFactory;");
+ else
+ out.write("private Object connectionFactory;");
+ writeEol(out);
+ writeEol(out);
+ }
+ /**
* Output test basic method
* @param def definition
* @param out Writer
@@ -247,49 +271,8 @@
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("Context context = null;");
- writeEol(out);
- writeIndent(out, indent + 1);
- out.write("try");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("context = new InitialContext();");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write("Object o = context.lookup(JNDI_PREFIX + deploymentName);");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write("assertNotNull(o);");
- writeRightCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 1);
- out.write("catch (Throwable t)");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("log.error(t.getMessage(), t);");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write("fail(t.getMessage());");
- writeRightCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 1);
- out.write("finally");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("if (context != null)");
- writeLeftCurlyBracket(out, indent + 2);
- writeIndent(out, indent + 3);
- out.write("try");
- writeLeftCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 4);
- out.write("context.close();");
- writeRightCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 3);
- out.write("catch (NamingException ne)");
- writeLeftCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 4);
- out.write("// Ignore");
- writeRightCurlyBracket(out, indent + 3);
- writeRightCurlyBracket(out, indent + 2);
- writeRightCurlyBracket(out, indent + 1);
+ out.write("assertNotNull(connectionFactory);");
+
writeRightCurlyBracket(out, indent);
}
@@ -327,35 +310,23 @@
out.write("public void test" + upcaseFirst(method.getMethodName()) + "() throws Throwable");
writeLeftCurlyBracket(out, indent);
+
writeIndent(out, indent + 1);
- out.write("Context context = null;");
+ out.write("assertNotNull(connectionFactory);");
writeEol(out);
writeIndent(out, indent + 1);
- out.write("try");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("context = new InitialContext();");
+ out.write(def.getConnInterfaceClass() + " connection = connectionFactory.getConnection();");
writeEol(out);
- writeIndent(out, indent + 2);
- out.write(def.getCfInterfaceClass() + " cf = (" + def.getCfInterfaceClass() +
- ")context.lookup(JNDI_PREFIX + deploymentName);");
+ writeIndent(out, indent + 1);
+ out.write("assertNotNull(connection);");
writeEol(out);
- writeIndent(out, indent + 2);
- out.write("assertNotNull(cf);");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write(def.getConnInterfaceClass() + " c = cf.getConnection();");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write("assertNotNull(c);");
- writeEol(out);
- writeIndent(out, indent + 2);
+ writeIndent(out, indent + 1);
if (!method.getReturnType().equals("void"))
{
out.write(method.getReturnType() + " result = ");
}
- out.write("c." + method.getMethodName() + "(");
+ out.write("connection." + method.getMethodName() + "(");
int paramSize = method.getParams().size();
for (int i = 0; i < paramSize; i++)
{
@@ -365,38 +336,7 @@
out.write(", ");
}
out.write(");");
- writeEol(out);
-
- writeRightCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 1);
- out.write("catch (Throwable t)");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("log.error(t.getMessage(), t);");
- writeEol(out);
- writeIndent(out, indent + 2);
- out.write("fail(t.getMessage());");
- writeRightCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 1);
- out.write("finally");
- writeLeftCurlyBracket(out, indent + 1);
- writeIndent(out, indent + 2);
- out.write("if (context != null)");
- writeLeftCurlyBracket(out, indent + 2);
- writeIndent(out, indent + 3);
- out.write("try");
- writeLeftCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 4);
- out.write("context.close();");
- writeRightCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 3);
- out.write("catch (NamingException ne)");
- writeLeftCurlyBracket(out, indent + 3);
- writeIndent(out, indent + 4);
- out.write("// Ignore");
- writeRightCurlyBracket(out, indent + 3);
- writeRightCurlyBracket(out, indent + 2);
- writeRightCurlyBracket(out, indent + 1);
+
writeRightCurlyBracket(out, indent);
writeEol(out);
}
More information about the jboss-cvs-commits
mailing list