Skip to content

Commit 74b5a6e

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
add/modify test cases for utPLSQL version and use of new annotation API
1 parent 8311662 commit 74b5a6e

File tree

1 file changed

+139
-29
lines changed

1 file changed

+139
-29
lines changed

‎sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend

Lines changed: 139 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class DalTest extends AbstractJdbcTest {
8686
Assert.assertTrue(dao.utAnnotationManagerInstalled)
8787
}
8888

89-
@Test
90-
def void containsUtplsqlTest() {
89+
def void containsUtplsqlTest(String utPlsqlVersion) {
9190
val dao = new UtplsqlDao(dataSource.connection)
91+
dao.utPlsqlVersion = utPlsqlVersion
9292
jdbcTemplate.execute('''
9393
CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
9494
-- %suite
@@ -125,10 +125,20 @@ class DalTest extends AbstractJdbcTest {
125125
Assert.assertFalse(dao.containsUtplsqlTest("scott", "junit_utplsql_test_pkg", "t3"))
126126
jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
127127
}
128-
128+
129+
@Test
130+
def void containsUtplsqlTest304() {
131+
containsUtplsqlTest("3.0.4")
132+
}
133+
129134
@Test
130-
def void annotations() {
135+
def void containsUtplsqlTest313() {
136+
containsUtplsqlTest("3.1.3")
137+
}
138+
139+
def void annotations(String utPlsqlVersion) {
131140
val dao = new UtplsqlDao(dataSource.connection)
141+
dao.utPlsqlVersion = utPlsqlVersion
132142
jdbcTemplate.execute('''
133143
CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
134144
-- %suite
@@ -146,31 +156,39 @@ class DalTest extends AbstractJdbcTest {
146156
val expected = new ArrayList<Annotation>
147157
val suite = new Annotation
148158
suite.objectOwner = "SCOTT"
149-
suite.objectType = "PACKAGE"
150159
suite.objectName = "JUNIT_UTPLSQL_TEST_PKG"
151160
suite.name = 'suite'
161+
suite.subobjectName = suite.objectName
152162
expected.add(suite)
153163
val t1 = new Annotation
154164
t1.objectOwner = "SCOTT"
155-
t1.objectType = "PACKAGE"
156165
t1.objectName = "JUNIT_UTPLSQL_TEST_PKG"
157166
t1.name = 'test'
158-
t1.subobjectName = 't1'
167+
t1.subobjectName = 'T1'
159168
expected.add(t1)
160169
val t2 = new Annotation
161170
t2.objectOwner = "SCOTT"
162-
t2.objectType = "PACKAGE"
163171
t2.objectName = "JUNIT_UTPLSQL_TEST_PKG"
164172
t2.name = 'test'
165-
t2.subobjectName = 't2'
173+
t2.subobjectName = 'T2'
166174
expected.add(t2)
167175
Assert.assertEquals(expected.toString, actual.toString)
168176
jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
169177
}
170-
178+
179+
@Test
180+
def void annotations304() {
181+
annotations("3.0.4")
182+
}
183+
171184
@Test
172-
def void testablesPackages() {
185+
def void annotations313() {
186+
annotations("3.1.3")
187+
}
188+
189+
def void testablesPackages(String utPlsqlVersion) {
173190
val dao = new UtplsqlDao(dataSource.connection)
191+
dao.utPlsqlVersion = utPlsqlVersion
174192
jdbcTemplate.execute('''
175193
CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
176194
-- %suite
@@ -197,8 +215,18 @@ class DalTest extends AbstractJdbcTest {
197215
}
198216

199217
@Test
200-
def void testablesTypes() {
218+
def void testablesPackages304() {
219+
testablesPackages("3.0.4")
220+
}
221+
222+
@Test
223+
def void testablesPackages313() {
224+
testablesPackages("3.1.3")
225+
}
226+
227+
def void testablesTypes(String utPlsqlVersion) {
201228
val dao = new UtplsqlDao(dataSource.connection)
229+
dao.utPlsqlVersion = utPlsqlVersion
202230
jdbcTemplate.execute('''
203231
CREATE OR REPLACE TYPE junit_tab1_ot IS object (a integer, b integer);
204232
''')
@@ -218,8 +246,18 @@ class DalTest extends AbstractJdbcTest {
218246
}
219247

220248
@Test
221-
def void testablesFunctions() {
249+
def void testablesTypes304() {
250+
testablesTypes("3.0.4")
251+
}
252+
253+
@Test
254+
def void testablesTypes313() {
255+
testablesTypes("3.1.3")
256+
}
257+
258+
def void testablesFunctions(String utPlsqlVersion) {
222259
val dao = new UtplsqlDao(dataSource.connection)
260+
dao.utPlsqlVersion = utPlsqlVersion
223261
jdbcTemplate.execute('''
224262
CREATE OR REPLACE FUNCTION junit_f RETURN INTEGER IS
225263
BEGIN
@@ -232,8 +270,18 @@ class DalTest extends AbstractJdbcTest {
232270
}
233271

234272
@Test
235-
def void testablesProcedures() {
273+
def void testablesFunctions304() {
274+
testablesFunctions("3.0.4")
275+
}
276+
277+
@Test
278+
def void testablesFunctions313() {
279+
testablesFunctions("3.1.3")
280+
}
281+
282+
def void testablesProcedures(String utPlsqlVersion) {
236283
val dao = new UtplsqlDao(dataSource.connection)
284+
dao.utPlsqlVersion = utPlsqlVersion
237285
jdbcTemplate.execute('''
238286
CREATE OR REPLACE PROCEDURE junit_p RETURN INTEGER IS
239287
BEGIN
@@ -246,22 +294,32 @@ class DalTest extends AbstractJdbcTest {
246294
}
247295

248296
@Test
249-
def void runnables() {
297+
def void testablesProcedures304() {
298+
testablesProcedures("3.0.4")
299+
}
300+
301+
@Test
302+
def void testablesProcedures313() {
303+
testablesProcedures("3.1.3")
304+
}
305+
306+
def void runnables(String utPlsqlVersion) {
250307
val dao = new UtplsqlDao(dataSource.connection)
308+
dao.utPlsqlVersion = utPlsqlVersion
251309
jdbcTemplate.execute('''
252310
CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
253311
-- %suite
254312
-- %suitepath(a.B.c)
255313
256314
-- %test
257-
PROCEDURE t0;
315+
PROCEDURE T0;
258316
259-
-- %context(mycontext)
317+
-- %context(myContext)
260318
261-
-- %test
319+
-- %test(t1: test One)
262320
PROCEDURE t1;
263321
264-
-- %test
322+
-- %test(t2: test Two)
265323
PROCEDURE t2;
266324
267325
-- %endcontext
@@ -278,20 +336,30 @@ class DalTest extends AbstractJdbcTest {
278336
}
279337
Assert.assertEquals(null, actual.get("SUITE"))
280338
Assert.assertEquals("SUITE", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG"))
281-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t0"))
282-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t1"))
283-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t2"))
284-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t3"))
339+
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T0"))
340+
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T1"))
341+
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T2"))
342+
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T3"))
285343
Assert.assertEquals(null, actual.get("SUITEPATH"))
286344
Assert.assertEquals("SUITEPATH", actual.get("SCOTT:a"))
287345
Assert.assertEquals("SCOTT:a", actual.get("SCOTT:a.b"))
288346
Assert.assertEquals("SCOTT:a.b", actual.get("SCOTT:a.b.c"))
289-
Assert.assertEquals("SCOTT:a.b.c", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG"))
290-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext"))
291-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.t0"))
292-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.t3"))
293-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext.t1"))
294-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext", actual.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext.t2"))
347+
Assert.assertEquals("SCOTT:a.b.c", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg"))
348+
Assert.assertEquals("SCOTT:a.b.c.junit_utplsql_test_pkg", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg.myContext"))
349+
Assert.assertEquals("SCOTT:a.b.c.junit_utplsql_test_pkg", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg.t0"))
350+
Assert.assertEquals("SCOTT:a.b.c.junit_utplsql_test_pkg", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg.t3"))
351+
Assert.assertEquals("SCOTT:a.b.c.junit_utplsql_test_pkg.myContext", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg.myContext.t1"))
352+
Assert.assertEquals("SCOTT:a.b.c.junit_utplsql_test_pkg.myContext", actual.get("SCOTT:a.b.c.junit_utplsql_test_pkg.myContext.t2"))
353+
}
354+
355+
@Test
356+
def void runnables304() {
357+
runnables("3.0.4")
358+
}
359+
360+
@Test
361+
def void runnables313() {
362+
runnables("3.1.3")
295363
}
296364

297365
@Test
@@ -361,5 +429,47 @@ class DalTest extends AbstractJdbcTest {
361429
val actual = dao.includes('junit_utplsql_test_pkg')
362430
Assert.assertEquals(#['JUNIT_UTPLSQL_TEST_PKG','JUNIT_F','UT_EXPECTATION'].sort, actual.sort)
363431
}
432+
433+
@Test
434+
def void normalizedPlsqlVersionOkRelease() {
435+
val dao = new UtplsqlDao(dataSource.connection)
436+
dao.utPlsqlVersion = "v3.1.10.1234"
437+
val actual = dao.normalizedUtPlsqlVersion()
438+
Assert.assertEquals("3.1.10", actual)
439+
}
440+
441+
@Test
442+
def void normalizedPlsqlVersionOkDevelop() {
443+
val dao = new UtplsqlDao(dataSource.connection)
444+
dao.utPlsqlVersion = "v3.1.10.1234-develop"
445+
val actual = dao.normalizedUtPlsqlVersion()
446+
Assert.assertEquals("3.1.10", actual)
447+
}
448+
449+
@Test
450+
def void normalizedPlsqlVersionNok() {
451+
val dao = new UtplsqlDao(dataSource.connection)
452+
dao.utPlsqlVersion = "bla bla 1.2"
453+
val actual = dao.normalizedUtPlsqlVersion()
454+
Assert.assertEquals("0.0.0", actual)
455+
}
456+
457+
@Test
458+
def void normaliedPlsqlVersionNumber() {
459+
val dao = new UtplsqlDao(dataSource.connection)
460+
dao.utPlsqlVersion = "3.14.37"
461+
val actual = dao.normalizedUtPlsqlVersionNumber()
462+
Assert.assertEquals(3014037, actual)
463+
}
464+
465+
@Test
466+
def void utPlsqlVersion() {
467+
val dao = new UtplsqlDao(dataSource.connection)
468+
val actual = dao.utPlsqlVersion
469+
val sql = "SELECT ut.version FROM DUAL"
470+
val expected = jdbcTemplate.queryForObject(sql, String)
471+
Assert.assertEquals(expected, actual)
472+
473+
}
364474

365475
}

0 commit comments

Comments
 (0)