user AAA pattern and lowercase code in oddgen TestTemplate #145

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java

@@ -39,13 +39,13 @@ public String generateSpec() {
         final StringBuilder sb = new StringBuilder();
         final String objectName = context.getObjectName().toLowerCase();
         final String packageName = context.getTestPackagePrefix() + objectName + context.getTestPackageSuffix();
-        sb.append("CREATE OR REPLACE PACKAGE ");
+        sb.append("create or replace package ");
         sb.append(packageName);
-        sb.append(" IS\n\n");
+        sb.append(" is\n\n");
         if (context.isGenerateComments()) {
-            sb.append("\t/* generated by utPLSQL for SQL Developer on ");
+            sb.append("\t-- generated by utPLSQL for SQL Developer on ");
             sb.append(today);
-            sb.append(" */\n\n");
+            sb.append("\n\n");
         }
         sb.append("\t--%suite(");
         sb.append(packageName);
@@ -68,7 +68,7 @@ public String generateSpec() {
                 if (context.isDisableTests()) {
                     sb.append("\t--%disabled\n");
                 }
-                sb.append("\tPROCEDURE ");
+                sb.append("\tprocedure ");
                 sb.append(context.getTestUnitPrefix());
                 sb.append(unit);
                 sb.append(context.getTestUnitSuffix());
@@ -82,7 +82,7 @@ public String generateSpec() {
                 sb.append("\t--%endcontext\n\n");
             }
         }
-        sb.append("END ");
+        sb.append("end ");
         sb.append(packageName);
         sb.append(";\n");
         sb.append("/");
@@ -93,15 +93,15 @@ public String generateSpec() {
     public String generateBody() {
         StringBuilder sb = new StringBuilder();
         final String objectName = context.getObjectName().toLowerCase();
-        sb.append("CREATE OR REPLACE PACKAGE BODY ");
+        sb.append("create or replace package body ");
         sb.append(context.getTestPackagePrefix());
         sb.append(objectName);
         sb.append(context.getTestPackageSuffix());
-        sb.append(" IS\n\n");
+        sb.append(" is\n\n");
         if (context.isGenerateComments()) {
-            sb.append("\t/* generated by utPLSQL for SQL Developer on ");
+            sb.append("\t-- generated by utPLSQL for SQL Developer on ");
             sb.append(today);
-            sb.append(" */\n\n");
+            sb.append("\n\n");
         }
         for (final String u : units) {
             final String unit = u.toLowerCase();
@@ -116,33 +116,34 @@ public String generateBody() {
                         sb.append(" case ");
                         sb.append(i);
                         sb.append(": ...\n");
+                    } else {
+                        sb.append("\n");
                     }
                     sb.append("\t--\n");
                 }
-                sb.append("\tPROCEDURE ");
+                sb.append("\tprocedure ");
                 sb.append(procedureName);
-                sb.append(" IS\n");
-                sb.append("\t\tl_actual   INTEGER := 0;\n");
-                sb.append("\t\tl_expected INTEGER := 1;\n");
-                sb.append("\tBEGIN\n");
+                sb.append(" is\n");
+                sb.append("\t\tl_actual   integer := 0;\n");
+                sb.append("\t\tl_expected integer := 1;\n");
+                sb.append("\tbegin\n");
                 if (context.isGenerateComments()) {
-                    sb.append("\t\t-- populate actual\n");
+                    sb.append("\t\t-- arrange\n\n");
+                    sb.append("\t\t-- act\n");
                     sb.append("\t\t-- ");
                     sb.append(objectName);
                     sb.append(".");
                     sb.append(unit);
                     sb.append(";\n\n");
-                    sb.append("\t\t-- populate expected\n");
-                    sb.append("\t\t-- ...\n\n");
                     sb.append("\t\t-- assert\n");
                 }
                 sb.append("\t\tut.expect(l_actual).to_equal(l_expected);\n");
-                sb.append("\tEND ");
+                sb.append("\tend ");
                 sb.append(procedureName);
                 sb.append(";\n\n");
             }
         }
-        sb.append("END ");
+        sb.append("end ");
         sb.append(context.getTestPackagePrefix());
         sb.append(objectName);
         sb.append(context.getTestPackageSuffix());