◐ Shell
reader mode source ↗
Skip to content
Merged

Feature/issue 145 update code templates aaa #152

Show file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
12 changes: 6 additions & 6 deletions sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,25 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
final LinkedHashMap<String, String> params = dedupNodes.get(0).getParams();
final StringBuilder sb = new StringBuilder();
if (YES.equals(params.get(RESET_PACKAGE))) {
sb.append("EXECUTE dbms_session.reset_package;\n");
}
sb.append("SET SERVEROUTPUT ON SIZE UNLIMITED\n");
if (YES.equals(params.get(CLEAR_SCREEN))) {
sb.append("CLEAR SCREEN\n");
}
if (dedupNodes.size() == 1) {
sb.append("EXECUTE ut.run('");
sb.append(getPath(dedupNodes.get(0), conn));
sb.append("');\n");
} else {
final List<String> paths = dedupNodes.stream().map(node -> getPath(node, conn)).collect(Collectors.toList());
sb.append("BEGIN\n");
sb.append("\tut.run(\n");
sb.append("\t\tut_varchar2_list(\n");
sb.append(StringTools.getCSV(paths, "\t\t\t"));
sb.append("\t\t)\n");
sb.append("\t);\n");
sb.append("END;\n");
sb.append("/\n");
}
final String ret = sb.toString();
11 changes: 6 additions & 5 deletions sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
if (generateFiles) {
resetConsoleOutput();
saveConsoleOutput(templateTools.mkdirs(outputDirectory));
if (deleteExistingfiles) {
saveConsoleOutput(deleteFiles(outputDirectory).toString());
}
sb.append("--\n");
sb.append("-- install generated utPLSQL test packages\n");
sb.append("--\n");
Expand All @@ -251,8 +251,9 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
context.setConn(conn);
final TestTemplate testTemplate = new TestTemplate(context);
if (generateFiles) {
final String packageName = context.getTestPackagePrefix() + nodeTools.toObjectName(node)
+ context.getTestPackageSuffix();
final String packagePath = outputDirectory + File.separator + packageName;
saveConsoleOutput(templateTools.writeToFile(packagePath + ".pks", testTemplate.generateSpec()));
saveConsoleOutput(templateTools.writeToFile(packagePath + ".pkb", testTemplate.generateBody()));
32 changes: 15 additions & 17 deletions sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ private String trimPlusNewLine(final String input) {

private CharSequence utSpecTemplate() {
StringBuilder sb = new StringBuilder();
sb.append("CREATE OR REPLACE PACKAGE ");
sb.append(testPackagePrefixTextField.getText());
sb.append("[package_name]");
sb.append(testPackageSuffixTextField.getText());
sb.append(" IS\n\n");
sb.append("\t--%suite\n");
if (!suitePathTextField.getText().isEmpty()) {
sb.append("\t--%suitepath(");
Expand All @@ -258,7 +258,7 @@ private CharSequence utSpecTemplate() {
sb.append("\n\t");
sb.append(utSpecProcTemplate().toString().trim().replace("\n", "\n\t"));
sb.append("\n\n");
sb.append("END ");
sb.append(testPackagePrefixTextField.getText());
sb.append("[package_name]");
sb.append(testPackageSuffixTextField.getText());
Expand All @@ -279,7 +279,7 @@ private CharSequence utSpecProcTemplate() {
if (disableTestsCheckBox.isSelected()) {
sb.append("--%disabled\n");
}
sb.append("PROCEDURE ");
sb.append(testUnitPrefixTextField.getText());
sb.append("[procedure_name]");
sb.append(testUnitSuffixTextField.getText());
Expand All @@ -296,14 +296,14 @@ private CharSequence utSpecProcTemplate() {

private CharSequence utBodyTemplate() {
StringBuilder sb = new StringBuilder();
sb.append("CREATE OR REPLACE PACKAGE BODY ");
sb.append(testPackagePrefixTextField.getText());
sb.append("[package_name]");
sb.append(testPackageSuffixTextField.getText());
sb.append(" IS\n\n\t");
sb.append(utBodyProcTemplate().toString().trim().replace("\n", "\n\t"));
sb.append("\n\n");
sb.append("END ");
sb.append(testPackagePrefixTextField.getText());
sb.append("[package_name]");
sb.append(testPackageSuffixTextField.getText());
Expand All @@ -328,26 +328,24 @@ private CharSequence utBodyProcTemplate() {
sb.append('\n');
sb.append("--\n");
}
sb.append("PROCEDURE ");
sb.append(testUnitPrefixTextField.getText());
sb.append("[procedure_name]");
sb.append(testUnitSuffixTextField.getText());
if (withContext) {
sb.append(i);
}
sb.append(" IS\n");
sb.append("\tl_actual INTEGER := 0;\n");
sb.append("\tl_expected INTEGER := 1;\n");
sb.append("BEGIN\n");
if (generateCommentsCheckBox.isSelected()) {
sb.append("\t-- populate actual\n");
sb.append("\t-- ...\n\n");
sb.append("\t-- populate expected\n");
sb.append("\t-- ...\n\n");
sb.append("\t-- assert\n");
}
sb.append("\tut.expect(l_actual).to_equal(l_expected);\n");
sb.append("END ");
sb.append(testUnitPrefixTextField.getText());
sb.append("[procedure_name]");
sb.append(testUnitSuffixTextField.getText());
Expand Down
Toggle all file notes Toggle all file annotations