feat: Converted to ios models part II

This commit is contained in:
Deven Joshi
2021-04-14 14:56:04 +05:30
parent 97c35371af
commit 88f9bcc80c
32 changed files with 217 additions and 253 deletions
@@ -35,7 +35,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'hey', id: 'test');
final message = Message(text: 'hey', id: 'test');
when(
() => mockDio.post<String>(
@@ -168,8 +168,7 @@ void main() {
requestOptions: FakeRequestOptions(),
));
await channelClient.sendAction(
Message.temp(id: 'messageid', text: ''), data);
await channelClient.sendAction(Message(id: 'messageid'), data);
verify(() => mockDio.post<String>('/messages/messageid/action', data: {
'id': 'testid',
@@ -335,7 +334,7 @@ void main() {
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'Hello');
final message = Message(text: 'Hello');
expect(
() => channelClient.pinMessage(message, 'InvalidType'),
@@ -355,7 +354,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'Hello', id: 'test');
final message = Message(text: 'Hello', id: 'test');
when(
() => mockDio.post<String>(
@@ -389,7 +388,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'Hello', id: 'test');
final message = Message(text: 'Hello', id: 'test');
when(
() => mockDio.post<String>(
@@ -567,7 +566,7 @@ void main() {
tokenProvider: (_) async => '',
);
client.state?.user = OwnUser.temp(id: 'test-id');
client.state?.user = OwnUser(id: 'test-id');
final channelClient = client.channel('messaging', id: 'testid');
const reactionType = 'test';
@@ -591,13 +590,8 @@ void main() {
);
await channelClient.sendReaction(
Message.temp(
Message(
id: 'messageid',
text: '',
reactionCounts: const <String, int>{},
reactionScores: const <String, int>{},
latestReactions: const <Reaction>[],
ownReactions: const <Reaction>[],
),
reactionType,
);
@@ -623,7 +617,7 @@ void main() {
tokenProvider: (_) async => '',
);
client.state?.user = OwnUser.temp(id: 'test-id');
client.state?.user = OwnUser(id: 'test-id');
final channelClient = client.channel('messaging', id: 'testid');
@@ -638,19 +632,14 @@ void main() {
);
await channelClient.deleteReaction(
Message.temp(
Message(
id: 'messageid',
text: '',
reactionCounts: const <String, int>{},
reactionScores: const <String, int>{},
latestReactions: const <Reaction>[],
ownReactions: const <Reaction>[],
),
Reaction(
type: 'test',
createdAt: DateTime.now(),
score: 0,
user: User.temp(
user: User(
id: client.state?.user?.id ?? '',
),
),
@@ -709,7 +698,7 @@ void main() {
);
final channelClient = client.channel('messaging', id: 'testid');
final members = ['vishal'];
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -743,7 +732,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -2091,7 +2080,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -2190,7 +2179,7 @@ void main() {
tokenProvider: (_) async => '',
);
final channelClient = client.channel('messaging', id: 'testid');
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -2225,7 +2214,7 @@ void main() {
);
final channelClient = client.channel('messaging', id: 'testid');
final members = ['vishal'];
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -2259,7 +2248,7 @@ void main() {
);
final channelClient = client.channel('messaging', id: 'testid');
final members = ['vishal'];
final message = Message.temp(text: 'test');
final message = Message(text: 'test');
when(
() => mockDio.post<String>(
@@ -38,7 +38,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -76,7 +76,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -112,7 +112,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -150,7 +150,7 @@ void main() {
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -184,7 +184,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -229,7 +229,7 @@ void main() {
Logger.root.level = Level.ALL;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -273,7 +273,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
@@ -310,7 +310,7 @@ void main() {
final connectFunc = MockFunctions().connectFunc;
final ws = WebSocket(
baseUrl: 'baseurl',
user: User.temp(id: 'testid'),
user: User(id: 'testid'),
logger: Logger('ws'),
connectParams: {'test': 'true'},
connectPayload: {'payload': 'test'},
+8 -12
View File
@@ -479,7 +479,7 @@ void main() {
final client = StreamChatClient('api-key', httpClient: mockDio);
expect(() => client.connectUserWithProvider(User.temp(id: 'test-id')),
expect(() => client.connectUserWithProvider(User(id: 'test-id')),
throwsA(isA<Exception>()));
});
@@ -517,7 +517,7 @@ void main() {
when(() => mockDio.interceptors).thenReturn(Interceptors());
final client = StreamChatClient('api-key', httpClient: mockDio);
final user = User.temp(id: 'test-id');
final user = User(id: 'test-id');
final data = {
'users': {user.id: user.toJson()},
};
@@ -542,8 +542,8 @@ void main() {
when(() => mockDio.interceptors).thenReturn(Interceptors());
final client = StreamChatClient('api-key', httpClient: mockDio);
final user = User.temp(id: 'test-id');
final user2 = User.temp(id: 'test-id2');
final user = User(id: 'test-id');
final user2 = User(id: 'test-id2');
final data = {
'users': {
@@ -739,10 +739,6 @@ void main() {
final client = StreamChatClient('api-key', httpClient: mockDio);
final message = Message(
id: 'test',
updatedAt: DateTime.now(),
createdAt: DateTime.now(),
text: '',
type: '',
);
when(
@@ -781,7 +777,7 @@ void main() {
),
);
await client.deleteMessage(Message.temp(id: messageId, text: ''));
await client.deleteMessage(Message(id: messageId, text: ''));
verify(() => mockDio.delete<String>('/messages/$messageId')).called(1);
});
@@ -1101,7 +1097,7 @@ void main() {
);
test('should throw argument error', () {
final message = Message.temp(text: 'Hello');
final message = Message(text: 'Hello');
expect(
() => client.pinMessage(message, 'InvalidType'),
throwsArgumentError,
@@ -1110,7 +1106,7 @@ void main() {
test('should complete successfully', () async {
const timeout = 30;
final message = Message.temp(text: 'Hello');
final message = Message(text: 'Hello');
when(
() => mockDio.post<String>(
@@ -1132,7 +1128,7 @@ void main() {
});
test('should unpin message successfully', () async {
final message = Message.temp(text: 'Hello');
final message = Message(text: 'Hello');
when(
() => mockDio.post<String>(
@@ -851,8 +851,8 @@ void main() {
expect(channelState.channel?.type, 'team');
expect(channelState.channel?.config, isA<ChannelConfig>());
expect(channelState.channel?.config, isNotNull);
expect(channelState.channel?.config?.commands, hasLength(1));
expect(channelState.channel?.config?.commands![0], isA<Command>());
expect(channelState.channel?.config.commands, hasLength(1));
expect(channelState.channel?.config.commands![0], isA<Command>());
expect(channelState.channel?.lastMessageAt,
DateTime.parse('2020-01-30T13:43:41.062362Z'));
expect(channelState.channel?.createdAt,
@@ -868,13 +868,13 @@ void main() {
'https://cdn.chrisshort.net/testing-certificate-chains-in-go/GOPHER_MIC_DROP.png',
);
expect(channelState.messages, hasLength(25));
expect(channelState.messages![0], isA<Message>());
expect(channelState.messages![0], isNotNull);
expect(channelState.messages[0], isA<Message>());
expect(channelState.messages[0], isNotNull);
expect(
channelState.messages![0].createdAt,
channelState.messages[0].createdAt,
DateTime.parse('2020-01-29T03:23:02.843948Z'),
);
expect(channelState.messages![0].user, isA<User>());
expect(channelState.messages[0].user, isA<User>());
expect(channelState.watcherCount, 5);
});
@@ -889,8 +889,8 @@ void main() {
"image": "https://cdn.chrisshort.net/testing-certificate-chains-in-go/GOPHER_MIC_DROP.png",
"example": 1
},
"watchers": null,
"read": null,
"watchers": [],
"read": [],
"messages": [
{
"id": "dry-meadow-0-2b73cc8b-cd86-4a01-8d40-bd82ad07a030",
@@ -25,7 +25,7 @@ void main() {
});
test('should serialize to json correctly', () {
final channel = ChannelModel.temp(
final channel = ChannelModel(
type: 'type',
id: 'id',
cid: 'a:a',
@@ -34,12 +34,12 @@ void main() {
expect(
channel.toJson(),
{'id': 'id', 'type': 'type', 'name': 'cool'},
{'id': 'id', 'type': 'type', 'frozen': false, 'name': 'cool'},
);
});
test('should serialize to json correctly when frozen is provided', () {
final channel = ChannelModel.temp(
final channel = ChannelModel(
type: 'type',
id: 'id',
cid: 'a:a',
@@ -51,12 +51,12 @@ void main() {
test('should serialize to json correctly', () {
final event = Event(
user: User.temp(id: 'id'),
user: User(id: 'id'),
type: 'type',
cid: 'cid',
connectionId: 'connectionId',
createdAt: DateTime.parse('2020-01-29T03:22:47.63613Z'),
me: OwnUser.temp(id: 'id2'),
me: OwnUser(id: 'id2'),
totalUnreadCount: 1,
unreadChannels: 1,
online: true,
@@ -97,7 +97,7 @@ void main() {
});
test('should serialize to json correctly', () {
final message = Message.temp(
final message = Message(
id: '4637f7e4-a06b-42db-ba5a-8d8270dd926f',
text:
'https://giphy.com/gifs/the-lion-king-live-action-5zvN79uTGfLMOVfQaA',
@@ -34,7 +34,7 @@ void main() {
expect(reaction.type, 'wow');
expect(
reaction.user.toJson(),
User.temp(id: '2de0297c-f3f2-489d-b930-ef77342edccf', extraData: {
User(id: '2de0297c-f3f2-489d-b930-ef77342edccf', extraData: {
'image': 'https://randomuser.me/api/portraits/women/45.jpg',
'name': 'Daisy Morgan'
}).toJson(),
@@ -49,7 +49,7 @@ void main() {
messageId: '76cd8c82-b557-4e48-9d12-87995d3a0e04',
createdAt: DateTime.parse('2020-01-28T22:17:31.108742Z'),
type: 'wow',
user: User.temp(id: '2de0297c-f3f2-489d-b930-ef77342edccf', extraData: {
user: User(id: '2de0297c-f3f2-489d-b930-ef77342edccf', extraData: {
'image': 'https://randomuser.me/api/portraits/women/45.jpg',
'name': 'Daisy Morgan'
}),
@@ -19,14 +19,14 @@ void main() {
test('should parse json correctly', () {
final read = Read.fromJson(json.decode(jsonExample));
expect(read.lastRead, DateTime.parse('2020-01-28T22:17:30.966485504Z'));
expect(read.user?.id, 'bbb19d9a-ee50-45bc-84e5-0584e79d0c9e');
expect(read.user.id, 'bbb19d9a-ee50-45bc-84e5-0584e79d0c9e');
expect(read.unreadMessages, 10);
});
test('should serialize to json correctly', () {
final read = Read(
lastRead: DateTime.parse('2020-01-28T22:17:30.966485504Z'),
user: User.temp(id: 'bbb19d9a-ee50-45bc-84e5-0584e79d0c9e'),
user: User(id: 'bbb19d9a-ee50-45bc-84e5-0584e79d0c9e'),
unreadMessages: 10,
);
@@ -18,7 +18,7 @@ void main() {
});
test('should serialize to json correctly', () {
final user = User.temp(
final user = User(
id: 'bbb19d9a-ee50-45bc-84e5-0584e79d0c9e',
role: 'abc',
);