Skip to content

Commit cf4af93

Browse files
Marat-GumerovMarat-Gumerov
committed
All tests ported to v4
1 parent f8ab3c7 commit cf4af93

File tree

8 files changed

+209
-261
lines changed

8 files changed

+209
-261
lines changed

‎test/contact-test.ts‎

Lines changed: 29 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,59 @@
1-
import * as requests from '../src/model/requests/requests';
21
import uuidv4 from 'uuid/v4';
3-
import * as models from '../src/model/model';
42
import 'mocha';
53
import {expect} from 'chai';
64
import {suiteBase} from "./suite-base";
5+
import {
6+
ContactAsFileRequest,
7+
ContactConvertRequest,
8+
ContactDto,
9+
ContactFromFileRequest,
10+
ContactSaveRequest,
11+
EmailAddress,
12+
ObjectExistsRequest,
13+
PhoneNumber,
14+
StorageFileLocation
15+
} from "../src/model";
716

8-
describe('Contact tests', function() {
17+
describe('Contact tests', function () {
918
let td = suiteBase(this);
1019
const surname = 'Cane';
1120

12-
/**
13-
* Contact format specified as Enum, but SDK represents it as an advanced type of string constants a string.
14-
* Test checks that value parsing works properly
15-
*/
16-
it('Contact format #pipeline', async function () {
17-
for (const format of ['VCard', 'Msg']) {
18-
const extension = (format == 'Msg') ? '.msg' : '.vcf';
19-
const fileName = uuidv4() + extension;
20-
await td.api().createContact(new requests.CreateContactRequest(
21-
format as 'VCard' | 'Msg',
22-
fileName,
23-
new models.HierarchicalObjectRequest(
24-
new models.HierarchicalObject('CONTACT', undefined, []),
25-
new models.StorageFolderLocation(td.storage(), td.folder())
26-
)));
27-
const exists = await td.api().objectExists(new requests.ObjectExistsRequest(td.folder() + '/' + fileName, td.storage()));
28-
expect(exists.body.exists).to.be.ok;
29-
}
30-
});
31-
3221
it('Save contact model #pipeline', async function () {
3322
const contact = getContactDto();
34-
3523
const contactFile = uuidv4() + '.vcf';
36-
await td.api().saveContactModel(
37-
new requests.SaveContactModelRequest(
38-
'VCard', contactFile, new models.StorageModelRqOfContactDto(
39-
contact, new models.StorageFolderLocation(td.storage(), td.folder()))));
40-
const exists = await td.api().objectExists(
41-
new requests.ObjectExistsRequest(
42-
td.folder() + '/' + contactFile, td.storage()));
43-
expect(exists.body.exists).to.be.ok;
24+
await td.api().contact.save(
25+
new ContactSaveRequest(new StorageFileLocation(td.storage(), td.folder(), contactFile), contact, 'VCard'));
26+
const exists = await td.api().cloudStorage.storage.objectExists(
27+
new ObjectExistsRequest(td.folder() + '/' + contactFile, td.storage()));
28+
expect(exists.exists).to.be.ok;
4429
});
4530

4631
it('Check contact converter #pipeline', async function () {
4732
let contactDto = getContactDto();
48-
let mapi = await td.api().convertContactModelToFile(new requests.ConvertContactModelToFileRequest(
49-
'Msg', contactDto));
50-
let vcard = await td.api().convertContact(new requests.ConvertContactRequest(
51-
'VCard', 'Msg', mapi.body));
52-
let vcardString = vcard.body.toString();
33+
let mapi = await td.api().contact.asFile(new ContactAsFileRequest('Msg', contactDto));
34+
let vcard = await td.api().contact.convert(new ContactConvertRequest(
35+
'VCard', 'Msg', mapi));
36+
let vcardString = vcard.toString();
5337
expect(vcardString).to.include(surname);
54-
let dto = await td.api().getContactFileAsModel(new requests.GetContactFileAsModelRequest('VCard', vcard.body));
55-
expect(dto.body.surname).to.be.equal(surname);
38+
let dto = await td.api().contact.fromFile(new ContactFromFileRequest('VCard', vcard));
39+
expect(dto.surname).to.be.equal(surname);
5640
});
5741

5842
it('Convert model to MapiModel #pipeline', async () => {
5943
const contactDto = getContactDto();
60-
const mapiContactDto = await td.api().convertContactModelToMapiModel(
61-
new requests.ConvertContactModelToMapiModelRequest(contactDto));
62-
expect(contactDto.surname).to.be.eq(mapiContactDto.body.nameInfo.surname);
44+
const mapiContactDto = await td.api().contact.asMapi(contactDto);
45+
expect(contactDto.surname).to.be.eq(mapiContactDto.nameInfo.surname);
6346
});
6447

65-
function getContactDto() {
66-
let contactDto = new models.ContactDto();
48+
function getContactDto(): ContactDto {
49+
let contactDto = new ContactDto();
6750
contactDto.surname = surname;
6851
contactDto.givenName = 'John';
6952
contactDto.gender = 'Male';
70-
const emailAddress = new models.EmailAddress();
53+
const emailAddress = new EmailAddress();
7154
emailAddress.address = 'address@aspose.com'
7255
contactDto.emailAddresses = [emailAddress];
73-
contactDto.phoneNumbers = [new models.PhoneNumber(undefined, '+47234325344')];
56+
contactDto.phoneNumbers = [new PhoneNumber(undefined, '+47234325344')];
7457
return contactDto;
7558
}
7659
});

‎test/email-model-test.ts‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎test/email-test.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import 'mocha';
2+
import {expect} from 'chai';
3+
import {suiteBase} from "./suite-base";
4+
import {EmailAsFileRequest, EmailConvertRequest, EmailDto, EmailFromFileRequest, MailAddress} from "../src/model";
5+
6+
7+
describe('Email tests', function () {
8+
let td = suiteBase(this);
9+
const from = 'from@aspose.com';
10+
11+
it('Check email converter #pipeline', async () => {
12+
let emailDto = getEmailDto();
13+
let mapi = await td.api().email.asFile(new EmailAsFileRequest('Msg', emailDto));
14+
let eml = await td.api().email.convert(new EmailConvertRequest('Eml', mapi));
15+
let emlString = eml.toString();
16+
expect(emlString).to.include(from);
17+
let dto = await td.api().email.fromFile(new EmailFromFileRequest('Eml', eml));
18+
expect(dto.from.address).to.be.equal(from);
19+
});
20+
21+
it('Convert model to MapiModel #pipeline', async () => {
22+
const emailDto = getEmailDto();
23+
const mapiMessageDto = await td.api().email.asMapi(emailDto);
24+
expect(emailDto.subject).to.be.eq(mapiMessageDto.subject);
25+
});
26+
27+
function getEmailDto(): EmailDto {
28+
let emailDto = new EmailDto();
29+
emailDto.from = new MailAddress(undefined, from);
30+
emailDto.to = [new MailAddress(undefined, 'to@aspose.com')];
31+
emailDto.subject = 'Some subject';
32+
emailDto.body = 'Some body';
33+
emailDto.date = new Date();
34+
return emailDto;
35+
}
36+
});

‎test/hierarchical-mapi-test.ts‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎test/mapi-calendar-test.ts‎

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,69 @@
1-
import * as requests from '../src/model/requests/requests';
2-
import * as models from '../src/model/model';
31
import 'mocha';
42
import {expect} from 'chai';
53
import {suiteBase} from "./suite-base";
64
import uuidv4 from "uuid/v4";
5+
import {
6+
MapiCalendarAsFileRequest,
7+
MapiCalendarAttendeesDto,
8+
MapiCalendarDailyRecurrencePatternDto,
9+
MapiCalendarDto,
10+
MapiCalendarEventRecurrenceDto,
11+
MapiCalendarFromFileRequest,
12+
MapiCalendarGetRequest,
13+
MapiCalendarSaveRequest,
14+
MapiElectronicAddressDto,
15+
MapiRecipientDto,
16+
StorageFileLocation
17+
} from "../src/model";
718

819

9-
describe('MAPI calendar tests', function() {
20+
describe('MAPI calendar tests', function () {
1021
let td = suiteBase(this);
1122

1223
it('Convert MAPI model to CalendarDto #pipeline', async () => {
1324
const mapiCalendarDto = getMapiCalendarDto();
14-
const calendarDto = await td.api().convertMapiCalendarModelToCalendarModel(
15-
new requests.ConvertMapiCalendarModelToCalendarModelRequest(mapiCalendarDto));
16-
expect(mapiCalendarDto.subject).to.be.eq(calendarDto.body.summary);
17-
expect(mapiCalendarDto.location).to.be.eq(calendarDto.body.location);
25+
const calendarDto = await td.api().mapi.calendar.asCalendarDto(mapiCalendarDto);
26+
expect(mapiCalendarDto.subject).to.be.eq(calendarDto.summary);
27+
expect(mapiCalendarDto.location).to.be.eq(calendarDto.location);
1828
});
1929

2030
it('Convert MAPI model to file #pipeline', async () => {
2131
const mapiCalendarDto = getMapiCalendarDto();
22-
const icsFile = await td.api().convertMapiCalendarModelToFile(
23-
new requests.ConvertMapiCalendarModelToFileRequest('Ics', mapiCalendarDto));
24-
const icsString = icsFile.body.toString();
32+
const icsFile = await td.api().mapi.calendar.asFile(new MapiCalendarAsFileRequest('Ics', mapiCalendarDto));
33+
const icsString = icsFile.toString();
2534
expect(icsString).to.contain(mapiCalendarDto.location);
26-
const mapiCalendarDtoConverted = await td.api().getCalendarFileAsMapiModel(
27-
new requests.GetCalendarFileAsMapiModelRequest(icsFile.body));
28-
expect(mapiCalendarDto.location).to.be.eq(mapiCalendarDtoConverted.body.location);
35+
const mapiCalendarDtoConverted = await td.api().mapi.calendar.fromFile(
36+
new MapiCalendarFromFileRequest(icsFile));
37+
expect(mapiCalendarDto.location).to.be.eq(mapiCalendarDtoConverted.location);
2938
});
3039

3140
it('Mapi calendar storage test #pipeline', async () => {
3241
const mapiCalendarDto = getMapiCalendarDto();
3342
const fileName = uuidv4() + '.msg';
34-
await td.api().saveMapiCalendarModel(
35-
new requests.SaveMapiCalendarModelRequest(fileName, "Msg",
36-
new models.StorageModelRqOfMapiCalendarDto(mapiCalendarDto, td.getStorageFolderLocation())));
37-
const mapiCalendarFromStorage = await td.api().getMapiCalendarModel(
38-
new requests.GetMapiCalendarModelRequest(fileName, td.folder(), td.storage()));
39-
expect(mapiCalendarDto.location).to.be.eq(mapiCalendarFromStorage.body.location);
43+
await td.api().mapi.calendar.save(
44+
new MapiCalendarSaveRequest(new StorageFileLocation(td.storage(), td.folder(), fileName), mapiCalendarDto,
45+
'Msg'));
46+
const mapiCalendarFromStorage = await td.api().mapi.calendar.get(
47+
new MapiCalendarGetRequest(fileName, td.folder(), td.storage()));
48+
expect(mapiCalendarDto.location).to.be.eq(mapiCalendarFromStorage.location);
4049
});
4150

42-
function getMapiCalendarDto(): models.MapiCalendarDto {
43-
const mapiCalendarDto = new models.MapiCalendarDto();
44-
const mapiRecipientDto = new models.MapiRecipientDto();
51+
function getMapiCalendarDto(): MapiCalendarDto {
52+
const mapiCalendarDto = new MapiCalendarDto();
53+
const mapiRecipientDto = new MapiRecipientDto();
4554
mapiRecipientDto.addressType = "SMTP";
4655
mapiRecipientDto.displayName = "Attendee Name";
4756
mapiRecipientDto.emailAddress = "attendee@aspose.com";
4857
mapiRecipientDto.recipientType = "MapiTo";
49-
mapiCalendarDto.attendees = new models.MapiCalendarAttendeesDto([mapiRecipientDto]);
58+
mapiCalendarDto.attendees = new MapiCalendarAttendeesDto([mapiRecipientDto]);
5059
mapiCalendarDto.clientIntent = ["Manager"];
51-
const recurrence = new models.MapiCalendarEventRecurrenceDto();
52-
const recurrencePatternDto = new models.MapiCalendarDailyRecurrencePatternDto();
60+
const recurrence = new MapiCalendarEventRecurrenceDto();
61+
const recurrencePatternDto = new MapiCalendarDailyRecurrencePatternDto();
5362
recurrencePatternDto.occurrenceCount = 10;
5463
recurrencePatternDto.weekStartDay = "Monday";
5564
recurrence.recurrencePattern = recurrencePatternDto;
5665
mapiCalendarDto.recurrence = recurrence;
57-
mapiCalendarDto.organizer = new models.MapiElectronicAddressDto(undefined, "organizer@aspose.com");
66+
mapiCalendarDto.organizer = new MapiElectronicAddressDto(undefined, "organizer@aspose.com");
5867
mapiCalendarDto.busyStatus = "Tentative";
5968
mapiCalendarDto.startDate = td.getDate(undefined, 1);
6069
mapiCalendarDto.endDate = td.getDate(mapiCalendarDto.startDate, 1);
@@ -64,4 +73,5 @@ describe('MAPI calendar tests', function() {
6473
mapiCalendarDto.subject = "Some summary";
6574
return mapiCalendarDto;
6675
}
67-
});
76+
})
77+
;

0 commit comments

Comments
 (0)