Revision 6392bd64 test/gr/ebs/gss/server/ejb/ExternalAPITest.java

b/test/gr/ebs/gss/server/ejb/ExternalAPITest.java
22 22
import gr.ebs.gss.client.exceptions.DuplicateNameException;
23 23
import gr.ebs.gss.client.exceptions.InsufficientPermissionsException;
24 24
import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
25
import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
26
import gr.ebs.gss.server.domain.dto.FolderDTO;
27
import gr.ebs.gss.server.domain.dto.GroupDTO;
28
import gr.ebs.gss.server.domain.dto.UserDTO;
25
import gr.ebs.gss.server.domain.FileHeader;
26
import gr.ebs.gss.server.domain.Folder;
27
import gr.ebs.gss.server.domain.Group;
28
import gr.ebs.gss.server.domain.User;
29 29

  
30 30
import java.util.Hashtable;
31 31
import java.util.Iterator;
......
81 81
	public final void testGetRootFolderNormal() {
82 82
		try {
83 83
			final ExternalAPIRemote service = getService();
84
			final FolderDTO f = service.getRootFolder(Long.valueOf(1));
84
			final Folder f = service.getRootFolder(Long.valueOf(1));
85 85
			Assert.assertNotNull(f);
86 86
		} catch (final Exception e) {
87 87
			e.printStackTrace();
......
152 152
	public final void testGetFilesNormal() {
153 153
		try {
154 154
			final ExternalAPIRemote service = getService();
155
			final List<FileHeaderDTO> files = service.getFiles(new Long(1L), Long.valueOf(1), true);
155
			final List<FileHeader> files = service.getFiles(new Long(1L), Long.valueOf(1), true);
156 156
			Assert.assertNotNull(files);
157 157
			Assert.assertFalse(files.isEmpty());
158 158
		} catch (final Exception e) {
......
170 170
	public final void testGetFilesWithEmptyFolder() {
171 171
		try {
172 172
			final ExternalAPIRemote service = getService();
173
			final List<FileHeaderDTO> files = service.getFiles(new Long(1L), Long.valueOf(2), true);
173
			final List<FileHeader> files = service.getFiles(new Long(1L), Long.valueOf(2), true);
174 174
			Assert.assertNotNull(files);
175 175
			Assert.assertTrue(files.isEmpty());
176 176
		} catch (final Exception e) {
......
207 207
	public final void testGetFilesWithNonExistentFolder() {
208 208
		try {
209 209
			final ExternalAPIRemote service = getService();
210
			final List<FileHeaderDTO> files = service.getFiles(new Long(1L), Long.valueOf(-1), true);
210
			final List<FileHeader> files = service.getFiles(new Long(1L), Long.valueOf(-1), true);
211 211
			Assert.assertNotNull(files);
212 212
			Assert.assertTrue(files.isEmpty());
213 213
		} catch (final Exception e) {
......
223 223
	public final void testGetGroupsNormal() {
224 224
		try {
225 225
			final ExternalAPIRemote service = getService();
226
			final List<GroupDTO> groups = service.getGroups(Long.valueOf(1));
226
			final List<Group> groups = service.getGroups(Long.valueOf(1));
227 227
			Assert.assertNotNull(groups);
228 228
			Assert.assertFalse(groups.isEmpty());
229 229
		} catch (final Exception e) {
......
239 239
	public final void testGetGroupsForUserWithNoGroups() {
240 240
		try {
241 241
			final ExternalAPIRemote service = getService();
242
			final List<GroupDTO> groups = service.getGroups(Long.valueOf(2));
242
			final List<Group> groups = service.getGroups(Long.valueOf(2));
243 243
			Assert.assertNotNull(groups);
244 244
			Assert.assertTrue(groups.isEmpty());
245 245
		} catch (final Exception e) {
......
272 272
	public final void testGetGroupsForNonExistentUser() {
273 273
		try {
274 274
			final ExternalAPIRemote service = getService();
275
			final List<GroupDTO> groups = service.getGroups(Long.valueOf(-1));
275
			final List<Group> groups = service.getGroups(Long.valueOf(-1));
276 276
			Assert.assertNotNull(groups);
277 277
			Assert.assertTrue(groups.isEmpty());
278 278
		} catch (final Exception e) {
......
288 288
	public final void testGetUsersNormal() {
289 289
		try {
290 290
			final ExternalAPIRemote service = getService();
291
			final List<UserDTO> users = service.getUsers(Long.valueOf(1), Long.valueOf(1));
291
			final List<User> users = service.getUsers(Long.valueOf(1), Long.valueOf(1));
292 292
			Assert.assertNotNull(users);
293 293
			Assert.assertFalse(users.isEmpty());
294 294
		} catch (final Exception e) {
......
304 304
	public final void testGetUsersForEmptyGroup() {
305 305
		try {
306 306
			final ExternalAPIRemote service = getService();
307
			final List<UserDTO> users = service.getUsers(Long.valueOf(1L), Long.valueOf(2));
307
			final List<User> users = service.getUsers(Long.valueOf(1L), Long.valueOf(2));
308 308
			Assert.assertNotNull(users);
309 309
			Assert.assertTrue(users.isEmpty());
310 310
		} catch (final Exception e) {
......
320 320
	public final void testGetUsersNonExistentGroup() {
321 321
		try {
322 322
			final ExternalAPIRemote service = getService();
323
			final List<UserDTO> users = service.getUsers(Long.valueOf(1L), Long.valueOf(-1));
323
			final List<User> users = service.getUsers(Long.valueOf(1L), Long.valueOf(-1));
324 324
			Assert.assertNotNull(users);
325 325
			Assert.assertTrue(users.isEmpty());
326 326
		} catch (final Exception e) {
......
361 361
				final Iterator i = rootSubfolders.iterator();
362 362
				ok = true;
363 363
				while (i.hasNext()) {
364
					final FolderDTO f = (FolderDTO) i.next();
364
					final Folder f = (Folder) i.next();
365 365
					if (f.getName().equals(name)) {
366 366
						name = name + "!";
367 367
						ok = false;
......
372 372
			service.createFolder(Long.valueOf(1), Long.valueOf(1), name);
373 373
			final Iterator i = service.getRootFolder(Long.valueOf(1)).getSubfolders().iterator();
374 374
			while (i.hasNext()) {
375
				final FolderDTO f = (FolderDTO) i.next();
375
				final Folder f = (Folder) i.next();
376 376
				if (f.getName().equals(name))
377 377
					return;
378 378
			}
......
392 392
		try {
393 393
			final ExternalAPIRemote service = getService();
394 394
			final List rootSubfolders = service.getRootFolder(Long.valueOf(1)).getSubfolders();
395
			service.createFolder(Long.valueOf(1), Long.valueOf(1), ((FolderDTO) rootSubfolders.get(0)).getName());
395
			service.createFolder(Long.valueOf(1), Long.valueOf(1), ((Folder) rootSubfolders.get(0)).getName());
396 396
			Assert.fail();
397 397
		} catch (final Exception e) {
398 398
			if (!(e instanceof DuplicateNameException)) {
......
503 503
			final ExternalAPIRemote service = getService();
504 504
			final Iterator i = service.getRootFolder(Long.valueOf(1)).getSubfolders().iterator();
505 505
			while (i.hasNext()) {
506
				final FolderDTO f = (FolderDTO) i.next();
506
				final Folder f = (Folder) i.next();
507 507
				if (f.getName().equals(name))
508 508
					service.deleteFolder(Long.valueOf(1), f.getId());
509 509
			}
......
527 527
				service.createFolder(Long.valueOf(1), Long.valueOf(1), name);
528 528
				final Iterator i = service.getRootFolder(Long.valueOf(1)).getSubfolders().iterator();
529 529
				while (i.hasNext()) {
530
					final FolderDTO f = (FolderDTO) i.next();
530
					final Folder f = (Folder) i.next();
531 531
					if (f.getName().equals(name)) {
532 532
						folderId = f.getId();
533 533
						service.deleteFolder(null, f.getId());
......
561 561
				service.createFolder(Long.valueOf(1), Long.valueOf(1), name);
562 562
				final Iterator i = service.getRootFolder(Long.valueOf(1)).getSubfolders().iterator();
563 563
				while (i.hasNext()) {
564
					final FolderDTO f = (FolderDTO) i.next();
564
					final Folder f = (Folder) i.next();
565 565
					if (f.getName().equals(name)) {
566 566
						folderId = f.getId();
567 567
						service.deleteFolder(Long.valueOf(-1), f.getId());
......
631 631
				service.createFolder(Long.valueOf(1), Long.valueOf(1), name);
632 632
				final Iterator i = service.getRootFolder(Long.valueOf(1)).getSubfolders().iterator();
633 633
				while (i.hasNext()) {
634
					final FolderDTO f = (FolderDTO) i.next();
634
					final Folder f = (Folder) i.next();
635 635
					if (f.getName().equals(name)) {
636 636
						folderId = f.getId();
637 637
						service.deleteFolder(Long.valueOf(2), f.getId());
......
652 652
	}
653 653

  
654 654
	/**
655
	 * Tests {@link ExternalAPIBean#getUserDTO(Long)} with normal parameters
655
	 * Tests {@link ExternalAPIBean#getUser(Long)} with normal parameters
656 656
	 */
657 657
	public final void testGetUserNormal() {
658 658
		try {
659 659
			final ExternalAPIRemote service = getService();
660
			final UserDTO user = service.getUserDTO(Long.valueOf(1));
660
			final User user = service.getUser(Long.valueOf(1));
661 661
			assertNotNull(user);
662 662
			assertNotNull(user.getId());
663 663
			assertEquals(user.getId().longValue(), 1L);
......
673 673
	public final void testGetUserNullId() {
674 674
		try {
675 675
			final ExternalAPIRemote service = getService();
676
			service.getUserDTO(null);
676
			service.getUser(null);
677 677
			Assert.fail();
678 678
		} catch (final NamingException e) {
679 679
			e.printStackTrace();
......
692 692
	public final void testGetUserNonExistentId() {
693 693
		try {
694 694
			final ExternalAPIRemote service = getService();
695
			service.getUserDTO(Long.valueOf(-1));
695
			service.getUser(Long.valueOf(-1));
696 696
			Assert.fail();
697 697
		} catch (final NamingException e) {
698 698
			e.printStackTrace();

Also available in: Unified diff