Merge pull request utPLSQL#50 from PhilippSalvisberg/develop

PhilippSalvisberg · web-flow · commit 5446db42555a · 2018-11-06T18:27:26.000+01:00
Fixes utPLSQL#49 - Wrong indentation in SQL Developer package body code template
diff --git a/sqldev/pom.xml b/sqldev/pom.xml
@@ -5,7 +5,7 @@
 	<!-- The Basics -->
 	<groupId>org.utplsql</groupId>
 	<artifactId>org.utplsql.sqldev</artifactId>
-	<version>0.6.4</version>
+	<version>0.6.5-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git 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»;
diff --git 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)
 	}
 
 }
