From 27cf63f8873043769d2faa275460ca59082768f5 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 6 Nov 2018 08:34:41 +0100 Subject: [PATCH 1/3] change to snapshot version 0.6.5-SNAPSHOT --- sqldev/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 411a813e..72b74fc5 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -5,7 +5,7 @@ org.utplsql org.utplsql.sqldev - 0.6.4 + 0.6.5-SNAPSHOT bundle UTF-8 From 258fe85d3f37e2ba2264887667ca13af0e89a7dc Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 6 Nov 2018 08:35:40 +0100 Subject: [PATCH 2/3] make test more robust by sorting results --- sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend index c116a79c..6ceb7544 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend @@ -359,7 +359,7 @@ class DalTest extends AbstractJdbcTest { val actualEmpty = dao.includes('TEST_F1') Assert.assertEquals(#[], actualEmpty) val actual = dao.includes('junit_utplsql_test_pkg') - Assert.assertEquals(#['JUNIT_UTPLSQL_TEST_PKG','JUNIT_F','UT_EXPECTATION'], actual) + Assert.assertEquals(#['JUNIT_UTPLSQL_TEST_PKG','JUNIT_F','UT_EXPECTATION'].sort, actual.sort) } } \ No newline at end of file From a64279dfaee7b59d620f870455d316bfde1d1da3 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 6 Nov 2018 08:36:26 +0100 Subject: [PATCH 3/3] fix wrong indentation in template --- sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend index e144328b..82aff318 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend @@ -251,7 +251,7 @@ class PreferencePanel extends DefaultTraversablePanel { -- populate expected -- ... - -- assert + -- assert «ENDIF» ut.expect(l_actual).to_equal(l_expected); END «testUnitPrefixTextField.text»[procedure_name]«testUnitSuffixTextField.text»«IF withContext»«i»«ENDIF»;