From 0be0280c28f26fd6daa7490bd6769a896039e863 Mon Sep 17 00:00:00 2001 From: paolo Date: Wed, 27 Apr 2016 16:32:28 +0200 Subject: [PATCH] Codeception v1 working --- .gitignore | 1 + tests/codeception/_data/dump.sql | 98 +++++++------------------ tests/codeception/api/v1/PersonCept.php | 8 +- tests/codeception/api/v1/PlanCept.php | 2 +- 4 files changed, 32 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index d0471e0b2..8c258003c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ tests/codeception/_support/_generated tests/codeception/_output/* !/tests/codeception/_output/.placeholder /submodules/d3 +composer.lock diff --git a/tests/codeception/_data/dump.sql b/tests/codeception/_data/dump.sql index 871b22b09..d72b8d895 100644 --- a/tests/codeception/_data/dump.sql +++ b/tests/codeception/_data/dump.sql @@ -1,5 +1,23 @@ +-- UPDATE tbl_studiengang +UPDATE public.tbl_studiengang SET onlinebewerbung = TRUE; + +-- EMPTY lehre.tbl_studienplan +DELETE FROM lehre.tbl_studienplan; +-- EMPTY lehre.tbl_studienordnung_semester +DELETE FROM lehre.tbl_studienordnung_semester; +-- EMPTY lehre.tbl_studienordnung +DELETE FROM lehre.tbl_studienordnung; +-- EMPTY public.tbl_studienjahr +DELETE FROM public.tbl_studienjahr; +-- EMPTY public.tbl_ort +DELETE FROM public.tbl_ort; +-- EMPTY public.tbl_kontakt +DELETE FROM public.tbl_kontakt WHERE person_id > 2; +-- EMPTY public.tbl_benutzer +DELETE FROM public.tbl_benutzer WHERE person_id > 2; -- EMPTY public.tbl_person DELETE FROM public.tbl_person WHERE person_id > 2; + -- INSERT Persons (public.tbl_person) INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567A', false); INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567B', false); @@ -127,96 +145,32 @@ INSERT INTO public.tbl_person VALUES (125, NULL, NULL, NULL, NULL, NULL, NULL, ' INSERT INTO public.tbl_person VALUES (126, NULL, NULL, NULL, NULL, NULL, NULL, 'Wehner', 'Kameron', 'Drake', '1990-03-04', 'Bernadinehaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.430179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false); INSERT INTO public.tbl_person VALUES (127, NULL, NULL, NULL, NULL, NULL, NULL, 'Terry', 'Clare', 'Genevieve', '1966-09-30', 'North Theodora', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.433865', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false); --- EMPTY public.tbl_benutzer -DELETE FROM public.tbl_benutzer WHERE person_id > 2; -- INSERT Benutzer (public.tbl_benutzer) INSERT INTO public.tbl_benutzer VALUES ('mckenzie', 3, 't', 'mckenzie.vicenta', NOW(), 'codeception', NOW(), 'codeception', NULL, 'codeception', NOW(), NULL); INSERT INTO public.tbl_benutzer VALUES ('wilderman', 4, 't', 'wilderman.rocio', NOW(), 'codeception', NOW(), 'codeception', NULL, 'codeception', NOW(), NULL); INSERT INTO public.tbl_benutzer VALUES ('harvey', 5, 't', 'harvey.joshuah', NOW(), 'codeception', NOW(), 'codeception', NULL, 'codeception', NOW(), NULL); INSERT INTO public.tbl_benutzer VALUES ('kessler', 6, 't', 'kessler.neil', NOW(), 'codeception', NOW(), 'codeception', NULL, 'codeception', NOW(), NULL); --- EMPTY public.tbl_kontakt -DELETE FROM public.tbl_kontakt WHERE person_id > 2; -- INSERT Kontakt (public.tbl_kontakt) INSERT INTO public.tbl_kontakt VALUES (1, 3, 'email', NULL, 'mckenzie.vicenta@calva.dev', 't', NOW(), NULL, NOW(), 'codeception', NULL, NULL); INSERT INTO public.tbl_kontakt VALUES (2, 4, 'email', NULL, 'wilderman.rocio@calva.dev', 't', NOW(), NULL, NOW(), 'codeception', NULL, NULL); INSERT INTO public.tbl_kontakt VALUES (3, 5, 'email', NULL, 'harvey.joshuah@calva.dev', 't', NOW(), NULL, NOW(), 'codeception', NULL, NULL); INSERT INTO public.tbl_kontakt VALUES (4, 6, 'email', NULL, 'kessler.neil@calva.dev', 't', NOW(), NULL, NOW(), 'codeception', NULL, NULL); --- EMPTY public.tbl_erhalter -DELETE FROM public.tbl_erhalter WHERE erhalter_kz = 1; --- INSERT Erhalter (public.tbl_erhalter) -INSERT INTO public.tbl_erhalter VALUES (1, '1S', 'Bla bla bla', '12345678', NULL, '1234567812345678'); - --- EMPTY public.tbl_studiengangstyp -DELETE FROM public.tbl_studiengangstyp WHERE typ = 'A'; --- INSERT Studiengangstyp (public.tbl_studiengangstyp) -INSERT INTO public.tbl_studiengangstyp VALUES ('A', 'Codeceptiongang', 'Codeceptiongang'); - --- EMPTY bis.tbl_bisorgform -DELETE FROM bis.tbl_bisorgform WHERE bisorgform_kurzbz = 'A'; --- INSERT Bisorgform (bis.tbl_bisorgform) -INSERT INTO bis.tbl_bisorgform VALUES ('A', 1, 'Vollzeit'); - --- EMPTY bis.tbl_orgform -DELETE FROM bis.tbl_orgform WHERE orgform_kurzbz = 'A'; --- INSERT Orgform (bis.tbl_orgform) -INSERT INTO bis.tbl_orgform VALUES ('A', 1, 'Vollzeit', 't', 'A'); - --- EMPTY public.tbl_organisationseinheittyp -DELETE FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz = 'A'; --- INSERT Organisationseinheittyp (public.tbl_organisationseinheittyp) -INSERT INTO public.tbl_organisationseinheittyp VALUES ('A', NULL, NULL); - --- EMPTY public.tbl_organisationseinheit -DELETE FROM public.tbl_organisationseinheit WHERE oe_kurzbz = 'A'; --- INSERT Organisationseinheit (public.tbl_organisationseinheit) -INSERT INTO public.tbl_organisationseinheit VALUES ('A', 'A', 'A', 'A', 't', 'f', NULL, NULL, 'f', NULL, NULL, NULL, NULL); - --- EMPTY public.tbl_studiengang -DELETE FROM public.tbl_studiengang WHERE studiengang_kz = 1; --- INSERT Studiengang (public.tbl_studiengang) -INSERT INTO public.tbl_studiengang VALUES (1, 'tw', '1S', 'A', 'Codeception test', 'Codeception test', NULL, 'admin@calva.dev', NULL, 6, 'A', 2, 1, NULL, '1/2', '2,3', '4/5', NOW(), NULL, 't', NULL, 'A', NULL, 't', 'English', 'f', NULL, 'A', NULL, 'f', 't', 'f'); - --- EMPTY public.tbl_lehrverband -DELETE FROM public.tbl_lehrverband WHERE studiengang_kz = 1; --- INSERT Lehrverband (public.tbl_lehrverband) -INSERT INTO public.tbl_lehrverband VALUES (1, 1, 'V', '1', 't', NULL, NULL, NULL, 1); - --- EMPTY public.tbl_mitarbeiter -DELETE FROM public.tbl_mitarbeiter WHERE mitarbeiter_uid = 'mckenzie'; --- INSERT Mitarbeiter (public.tbl_mitarbeiter) -INSERT INTO public.tbl_mitarbeiter VALUES ('mckenzie', 1, NULL, 'Blabla', 't', 't', NULL, NULL, NULL, NOW(), 'codeception', NOW(), 'codeception', NULL, NULL, 't', NULL, 'f'); - --- EMPTY public.tbl_ort -DELETE FROM public.tbl_ort WHERE ort_kurzbz = 'Nirvana'; -- INSERT Ort (public.tbl_ort) INSERT INTO public.tbl_ort VALUES ('Nirvana', 'Blablablabla', 'A-1', 2000, 't', 't', 't', NULL, 3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); --- EMPTY public.tbl_studienjahr -DELETE FROM public.tbl_studienjahr WHERE studienjahr_kurzbz = '2123/01'; -- INSERT Studienjahr (public.tbl_studienjahr) INSERT INTO public.tbl_studienjahr VALUES ('2123/01', NULL); --- EMPTY lehre.tbl_studienordnungstatus -DELETE FROM lehre.tbl_studienordnungstatus WHERE status_kurzbz = 'A'; --- INSERT Studienordnungstatus (lehre.tbl_studienordnungstatus) -INSERT INTO lehre.tbl_studienordnungstatus VALUES ('A', 'A', 1); - --- EMPTY public.tbl_studiensemester -DELETE FROM public.tbl_studiensemester WHERE studiensemester_kurzbz = 'A'; --- INSERT Studiensemester (public.tbl_studiensemester) -INSERT INTO public.tbl_studiensemester VALUES ('A', NOW(), NOW(), NULL, 'Bla bla bla', '2123/01', NULL, 't'); - --- EMPTY lehre.tbl_studienordnung -DELETE FROM lehre.tbl_studienordnung WHERE studienordnung_id = -1; -- INSERT Studienordnung (lehre.tbl_studienordnung) -INSERT INTO lehre.tbl_studienordnung VALUES (-1, 1, 01, 'A', 'A', 'A', 180.00, 'Bla bla bla', 'Bla bla bla bla', 'A', 1, NOW(), 'codeception', NOW(), 'codeception', NULL, 'A', NULL); +INSERT INTO lehre.tbl_studienordnung VALUES (1, 1, 01, 'WS2016', 'WS2016', 'A', 180.00, 'Bla bla bla', 'Bla bla bla bla', 'A', NULL, NOW(), 'codeception', NOW(), 'codeception', NULL, NULL, NULL); + +-- INSERT Studienordnung_semester (lehre.tbl_studienordnung_semester) +INSERT INTO lehre.tbl_studienordnung_semester VALUES (1, 1, 'WS2016', 1); --- EMPTY lehre.tbl_studienplan -DELETE FROM lehre.tbl_studienplan WHERE tbl_studienplan < 5; -- INSERT Studienplan (lehre.tbl_studienplan) -INSERT INTO lehre.tbl_studienplan VALUES (1, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); -INSERT INTO lehre.tbl_studienplan VALUES (2, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); -INSERT INTO lehre.tbl_studienplan VALUES (3, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); -INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); +INSERT INTO lehre.tbl_studienplan VALUES (1, 1, 'VZ', 'A', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); +INSERT INTO lehre.tbl_studienplan VALUES (2, 1, 'VZ', 'A', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); +INSERT INTO lehre.tbl_studienplan VALUES (3, 1, 'VZ', 'A', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); +INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'VZ', 'A', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL); \ No newline at end of file diff --git a/tests/codeception/api/v1/PersonCept.php b/tests/codeception/api/v1/PersonCept.php index fc99a4530..af4edd27c 100644 --- a/tests/codeception/api/v1/PersonCept.php +++ b/tests/codeception/api/v1/PersonCept.php @@ -11,7 +11,7 @@ $I->seeResponseContainsJson([ 'person_id' => '3', 'nachname' => 'McKenzie']); -$I->sendGET('v1/person/person/Person', array('code' => '01234567A')); +$I->sendGET('v1/person/person/Person', array('code' => '01234567B')); $I->wantTo('test the Person code'); $I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); $I->seeResponseCodeIs(200); @@ -28,9 +28,9 @@ $I->seeResponseContainsJson([ 'success' => false, 'message' => 'Person not found']); -/*$I->sendGET('v1/person/person/Person', array('code' => 'bd94ef5d5a', 'email' => '12351235')); +$I->sendGET('v1/person/person/Person', array('code' => '01234567C', 'email' => 'harvey.joshuah@calva.dev')); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson([ - 'success' => TRUE, - 'message' => 'Person found']);*/ + 'person_id' => '5', + 'nachname' => 'Harvey']); \ No newline at end of file diff --git a/tests/codeception/api/v1/PlanCept.php b/tests/codeception/api/v1/PlanCept.php index 481bf3e11..90ed424e0 100644 --- a/tests/codeception/api/v1/PlanCept.php +++ b/tests/codeception/api/v1/PlanCept.php @@ -4,7 +4,7 @@ $I = new ApiTester($scenario); $I->wantTo('Test API call v1/lehre/studienplan/Studienplaene'); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); -$I->sendGET('v1/lehre/studienplan/Studienplaene', array('studiengang_kz' => 257)); +$I->sendGET('v1/lehre/studienplan/Studienplaene', array('studiengang_kz' => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson([