Skip to content

Commit ea6b0e3

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
add test for includes, extend test for code coverage, rename effective to actual
1 parent d624060 commit ea6b0e3

File tree

1 file changed

+77
-42
lines changed

1 file changed

+77
-42
lines changed

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

Lines changed: 77 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DalTest extends AbstractJdbcTest {
3030
@BeforeClass
3131
@AfterClass
3232
def static void setupAndTeardown() {
33-
sysJdbcTemplate.execute("CREATE OR REPLACE PUBLIC SYNONYM ut FOR ut3.ut")
33+
sysJdbcTemplate.execute("CREATE OR REPLACE PUBLIC SYNONYM ut FOR ut3_latest_release.ut")
3434
try {
3535
jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
3636
} catch (BadSqlGrammarException e) {
@@ -77,7 +77,7 @@ class DalTest extends AbstractJdbcTest {
7777
val dao = new UtplsqlDao(dataSource.connection)
7878
Assert.assertEquals(null, dao.utplsqlSchema)
7979
setupAndTeardown
80-
Assert.assertEquals("UT3", dao.utplsqlSchema)
80+
Assert.assertEquals("UT3_LATEST_RELEASE", dao.utplsqlSchema)
8181
}
8282

8383
@Test
@@ -142,7 +142,7 @@ class DalTest extends AbstractJdbcTest {
142142
PROCEDURE t3;
143143
END junit_utplsql_test_pkg;
144144
''')
145-
val effective = dao.annotations("scott", "junit_utplsql_test_pkg")
145+
val actual = dao.annotations("scott", "junit_utplsql_test_pkg")
146146
val expected = new ArrayList<Annotation>
147147
val suite = new Annotation
148148
suite.objectOwner = "SCOTT"
@@ -164,7 +164,7 @@ class DalTest extends AbstractJdbcTest {
164164
t2.name = 'test'
165165
t2.subobjectName = 't2'
166166
expected.add(t2)
167-
Assert.assertEquals(expected.toString, effective.toString)
167+
Assert.assertEquals(expected.toString, actual.toString)
168168
jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
169169
}
170170

@@ -191,9 +191,9 @@ class DalTest extends AbstractJdbcTest {
191191
PROCEDURE p2;
192192
END junit_no_test_pkg;
193193
''')
194-
val effective = dao.testables('PACKAGE')
195-
Assert.assertEquals(1, effective.size)
196-
Assert.assertEquals("PACKAGE.JUNIT_NO_TEST_PKG", effective.get(0).id)
194+
val actual = dao.testables('PACKAGE')
195+
Assert.assertEquals(1, actual.size)
196+
Assert.assertEquals("PACKAGE.JUNIT_NO_TEST_PKG", actual.get(0).id)
197197
}
198198

199199
@Test
@@ -212,9 +212,9 @@ class DalTest extends AbstractJdbcTest {
212212
)
213213
);
214214
''')
215-
val effective = dao.testables('TYPE')
216-
Assert.assertEquals(1, effective.size)
217-
Assert.assertEquals("TYPE.JUNIT_TAB2_OT", effective.get(0).id)
215+
val actual = dao.testables('TYPE')
216+
Assert.assertEquals(1, actual.size)
217+
Assert.assertEquals("TYPE.JUNIT_TAB2_OT", actual.get(0).id)
218218
}
219219

220220
@Test
@@ -226,9 +226,9 @@ class DalTest extends AbstractJdbcTest {
226226
RETURN 1;
227227
END;
228228
''')
229-
val effective = dao.testables('FUNCTION')
230-
Assert.assertEquals(1, effective.size)
231-
Assert.assertEquals("FUNCTION.JUNIT_F", effective.get(0).id)
229+
val actual = dao.testables('FUNCTION')
230+
Assert.assertEquals(1, actual.size)
231+
Assert.assertEquals("FUNCTION.JUNIT_F", actual.get(0).id)
232232
}
233233

234234
@Test
@@ -240,9 +240,9 @@ class DalTest extends AbstractJdbcTest {
240240
NULL;
241241
END;
242242
''')
243-
val effective = dao.testables('PROCEDURE')
244-
Assert.assertEquals(1, effective.size)
245-
Assert.assertEquals("PROCEDURE.JUNIT_P", effective.get(0).id)
243+
val actual = dao.testables('PROCEDURE')
244+
Assert.assertEquals(1, actual.size)
245+
Assert.assertEquals("PROCEDURE.JUNIT_P", actual.get(0).id)
246246
}
247247

248248
@Test
@@ -270,28 +270,28 @@ class DalTest extends AbstractJdbcTest {
270270
PROCEDURE t3;
271271
END junit_utplsql_test_pkg;
272272
''')
273-
val effectiveNodes = dao.runnables()
274-
Assert.assertEquals(16, effectiveNodes.size)
275-
val effective = new HashMap<String, String>
276-
for (node : effectiveNodes) {
277-
effective.put(node.id, node.parentId)
273+
val actualNodes = dao.runnables()
274+
Assert.assertEquals(16, actualNodes.size)
275+
val actual = new HashMap<String, String>
276+
for (node : actualNodes) {
277+
actual.put(node.id, node.parentId)
278278
}
279-
Assert.assertEquals(null, effective.get("SUITE"))
280-
Assert.assertEquals("SUITE", effective.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG"))
281-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t0"))
282-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t1"))
283-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t2"))
284-
Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.t3"))
285-
Assert.assertEquals(null, effective.get("SUITEPATH"))
286-
Assert.assertEquals("SUITEPATH", effective.get("SCOTT:a"))
287-
Assert.assertEquals("SCOTT:a", effective.get("SCOTT:a.b"))
288-
Assert.assertEquals("SCOTT:a.b", effective.get("SCOTT:a.b.c"))
289-
Assert.assertEquals("SCOTT:a.b.c", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG"))
290-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext"))
291-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.t0"))
292-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.t3"))
293-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext.t1"))
294-
Assert.assertEquals("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext", effective.get("SCOTT:a.b.c.JUNIT_UTPLSQL_TEST_PKG.mycontext.t2"))
279+
Assert.assertEquals(null, actual.get("SUITE"))
280+
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"))
285+
Assert.assertEquals(null, actual.get("SUITEPATH"))
286+
Assert.assertEquals("SUITEPATH", actual.get("SCOTT:a"))
287+
Assert.assertEquals("SCOTT:a", actual.get("SCOTT:a.b"))
288+
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"))
295295
}
296296

297297
@Test
@@ -307,24 +307,59 @@ class DalTest extends AbstractJdbcTest {
307307
sys.dbms_output.put_line('line5');
308308
END;
309309
''')
310-
val effective = dao.getDbmsOutput(2)
310+
val actual = dao.getDbmsOutput(2)
311311
val expected = '''
312312
line1
313313
line2
314314
315315
line4
316316
line5
317317
'''
318-
Assert.assertEquals(expected, effective)
318+
Assert.assertEquals(expected, actual)
319319
}
320320

321321
@Test
322322
def void htmlCodeCoverage() {
323323
setupAndTeardown
324324
val dao = new UtplsqlDao(dataSource.connection)
325-
val effective = dao.htmlCodeCoverage(#["SCOTT"])
326-
Assert.assertTrue(effective.startsWith("<!DOCTYPE html>"))
327-
Assert.assertTrue(effective.trim.endsWith("</html>"))
325+
val actual = dao.htmlCodeCoverage(#["SCOTT"], #['scott'], #[], #[])
326+
Assert.assertTrue(actual.startsWith("<!DOCTYPE html>"))
327+
Assert.assertTrue(actual.trim.endsWith("</html>"))
328+
}
329+
330+
@Test
331+
def void includes() {
332+
setupAndTeardown
333+
jdbcTemplate.execute('''
334+
CREATE OR REPLACE FUNCTION junit_f RETURN INTEGER IS
335+
BEGIN
336+
RETURN 1;
337+
END junit_f;
338+
''')
339+
jdbcTemplate.execute('''
340+
CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS
341+
-- %suite
342+
343+
-- %test
344+
PROCEDURE f1;
345+
END junit_utplsql_test_pkg;
346+
''')
347+
jdbcTemplate.execute('''
348+
CREATE OR REPLACE PACKAGE BODY junit_utplsql_test_pkg IS
349+
PROCEDURE f1 IS
350+
l_expected INTEGER := 1;
351+
l_actual INTEGER;
352+
BEGIN
353+
l_actual := junit_f;
354+
ut.expect(l_actual).to_equal(l_expected).to_equal(l_actual);
355+
END f1;
356+
END junit_utplsql_test_pkg;
357+
''')
358+
val dao = new UtplsqlDao(dataSource.connection)
359+
val actualEmpty = dao.includes('TEST_F1')
360+
Assert.assertEquals(#[], actualEmpty)
361+
val actual = dao.includes('junit_utplsql_test_pkg')
362+
Assert.assertEquals(#['JUNIT_UTPLSQL_TEST_PKG','JUNIT_F'], actual)
328363
}
329364

330365
}

0 commit comments

Comments
 (0)