TestHashPage.java (apache-openmeetings-6.1.0-src) | : | TestHashPage.java (apache-openmeetings-6.2.0-src) | ||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
*/ | */ | |||
package org.apache.openmeetings.web.pages; | package org.apache.openmeetings.web.pages; | |||
import static java.util.UUID.randomUUID; | import static java.util.UUID.randomUUID; | |||
import static org.apache.openmeetings.web.common.OmWebSocketPanel.CONNECTED_MSG; | import static org.apache.openmeetings.web.common.OmWebSocketPanel.CONNECTED_MSG; | |||
import static org.apache.openmeetings.web.pages.HashPage.HASH; | import static org.apache.openmeetings.web.pages.HashPage.HASH; | |||
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH; | import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH; | |||
import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN; | import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN; | |||
import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING; | import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING; | |||
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID; | import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID; | |||
import static org.junit.Assert.assertTrue; | import static org.junit.Assert.assertEquals; | |||
import java.util.Date; | import java.util.Date; | |||
import java.util.UUID; | import java.util.UUID; | |||
import org.apache.openmeetings.AbstractWicketTester; | import org.apache.openmeetings.AbstractWicketTester; | |||
import org.apache.openmeetings.db.dao.record.RecordingDao; | import org.apache.openmeetings.db.dao.record.RecordingDao; | |||
import org.apache.openmeetings.db.dao.room.InvitationDao; | import org.apache.openmeetings.db.dao.room.InvitationDao; | |||
import org.apache.openmeetings.db.dao.room.RoomDao; | import org.apache.openmeetings.db.dao.room.RoomDao; | |||
import org.apache.openmeetings.db.entity.calendar.Appointment; | import org.apache.openmeetings.db.entity.calendar.Appointment; | |||
import org.apache.openmeetings.db.entity.record.Recording; | import org.apache.openmeetings.db.entity.record.Recording; | |||
skipping to change at line 70 | skipping to change at line 70 | |||
@Autowired | @Autowired | |||
protected RoomDao roomDao; | protected RoomDao roomDao; | |||
@Autowired | @Autowired | |||
protected RecordingDao recDao; | protected RecordingDao recDao; | |||
@Autowired | @Autowired | |||
protected InvitationDao inviteDao; | protected InvitationDao inviteDao; | |||
private void checkAccessDenied(boolean visible) { | private void checkAccessDenied(boolean visible) { | |||
@SuppressWarnings("unchecked") | @SuppressWarnings("unchecked") | |||
Modal<String> dlg = (Modal<String>)tester.getComponentFromLastRen deredPage("access-denied"); | Modal<String> dlg = (Modal<String>)tester.getComponentFromLastRen deredPage("access-denied"); | |||
assertTrue(tester.getLastResponseAsString().contains("$('#" + dlg .getMarkupId() + "').modal({keyboard:true, show:" + visible + "});")); | assertEquals(visible, tester.getLastResponseAsString().contains(" new bootstrap.Modal(document.getElementById('" + dlg.getMarkupId() + "')).show() ;")); | |||
} | } | |||
private void checkAccessDenied(PageParameters pp) { | private void checkAccessDenied(PageParameters pp) { | |||
tester.startPage(HashPage.class, pp); | tester.startPage(HashPage.class, pp); | |||
tester.assertRenderedPage(HashPage.class); | tester.assertRenderedPage(HashPage.class); | |||
checkAccessDenied(true); | checkAccessDenied(true); | |||
tester.assertInvisible(PANEL_MAIN); | tester.assertInvisible(PANEL_MAIN); | |||
} | } | |||
private HashPage commonCheck(PageParameters pp) { | private HashPage commonCheck(PageParameters pp) { | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |