Refactor/assert order + linter test (#366)

* renamed app to core, fixed assert order in tests

* add testAssertOrder linter test

* fix args order of two asserts

* rename some missing app to core

Co-authored-by: Paul Ermler <[email protected]>

Author: tom-richter

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/app..st

@@ -1,4 +1,4 @@
 accessing
 client
 
-	^ self app client
+	^ self core client

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/app.st

@@ -0,0 +1,4 @@
+accessing
+core: aCore
+
+	core := aCore.

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/client.st

@@ -0,0 +1,4 @@
+accessing
+core
+
+	^ core

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/core..st

@@ -8,4 +8,4 @@ handleEvent: anEvent
 	self isAwaitingDBEncryptionKey ifTrue: [self setDBEncryptionKey: ''].
 	self isAwaitingPhoneNumber ifTrue: [^ #awaitPhoneNumber].
 	self isAwaitingAuthCode ifTrue: [^ #awaitAuthCode].
-	self isAuthorizationStateReady ifTrue: [^ self app authSucceeded].
+	self isAuthorizationStateReady ifTrue: [^ self core authSucceeded].

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/core.st

@@ -4,13 +4,13 @@
 	"instance" : {
 		"apiHash" : "TR 4/27/2021 17:11",
 		"apiID" : "TR 4/27/2021 17:10",
-		"app" : "js 6/13/2020 18:12",
-		"app:" : "js 5/28/2020 17:02",
 		"authState" : "R.S 5/18/2020 17:54",
 		"authState:" : "R.S 5/18/2020 17:54",
 		"checkAuthenticationCode:" : "js 6/13/2020 18:31",
-		"client" : "js 5/28/2020 18:36",
-		"handleEvent:" : "js 8/2/2020 12:54",
+		"client" : "per 5/21/2021 16:55",
+		"core" : "per 5/21/2021 16:57",
+		"core:" : "per 5/21/2021 16:57",
+		"handleEvent:" : "per 5/21/2021 16:55",
 		"initialize" : "RS 4/28/2021 18:04",
 		"isAuthStateClosed" : "r.s 7/15/2020 12:17",
 		"isAuthorizationStateReady" : "r.s 7/15/2020 12:17",

packages/TelegramClient-Core.package/TCCAuthHandler.class/instance/handleEvent..st

@@ -7,7 +7,7 @@
 	"commentStamp" : "js 6/13/2020 16:25",
 	"instvars" : [
 		"authState",
-		"app" ],
+		"core" ],
 	"name" : "TCCAuthHandler",
 	"pools" : [
 		 ],

packages/TelegramClient-Core.package/TCCAuthHandler.class/methodProperties.json

@@ -10,6 +10,6 @@ addChat: aChatEvent
 		self loadBasicGroupInfoFor: chat with: (((aChatEvent at: 'chat') at: 'type') at: 'basic_group_id').
 	].
 
-	self app chats
+	self core chats
 		add: chat; 
 		notify.

packages/TelegramClient-Core.package/TCCAuthHandler.class/properties.json

@@ -2,8 +2,8 @@ events
 addNewMessage: aMessageJSONObject from: aUser
 
 	| chat message |
-	chat := self app chats getChat: (aMessageJSONObject at: 'chat_id').
+	chat := self core chats getChat: (aMessageJSONObject at: 'chat_id').
 	message := TCCMessage newFromMessageEvent: aMessageJSONObject in: chat from: aUser.
 
 	chat addNewestMessage: message.
-	self app triggerEvent: #newMessageReceived with: message.
+	self core triggerEvent: #newMessageReceived with: message.

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addChat..st

@@ -5,7 +5,7 @@ chatHistoryReceived: aChatHistory
 
 	(aChatHistory at: 'messages') ifNotEmpty: [
 		chatID := (aChatHistory at: 'messages') first at: 'chat_id'.
-		chat := self app chats getChat: chatID.
+		chat := self core chats getChat: chatID.
 
 		(aChatHistory at: 'messages') do: [:message | chat addOldestMessage: (TCCMessage newFromMessageEvent: message in: chat)].
 

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addNewMessage.from..st

@@ -1,4 +1,4 @@
 accessing
 client
 
-	^ self app client
+	^ self core client

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/app..st

@@ -0,0 +1,4 @@
+accessing
+core: aCore
+
+	core := aCore.

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/app.st

@@ -0,0 +1,4 @@
+accessing
+core
+
+	^ core

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/chatHistoryReceived..st

@@ -3,7 +3,7 @@ getChatHistoryFrom: aChatID with: aMessageId limit: aLimit
 
 	| chat |
 
-	chat := self app chats getChat: aChatID.
+	chat := self core chats getChat: aChatID.
 	chat ifNotWaitingForUpdate: [
 		self client send: (TCCRequest
 			newWithType: 'getChatHistory'

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/client.st

@@ -7,7 +7,7 @@ loadBasicGroupInfoFor: aChat with: aBasicGroupId
 			'basic_group_id'->aBasicGroupId.
 			'@extra'->aBasicGroupId}).
 
-	self app
+	self core
 		registerCallback: [:aBasicGroupFullInfoEvent |
 			aChat
 				memberCount: (aBasicGroupFullInfoEvent at: 'members') size;

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/core..st

@@ -7,7 +7,7 @@ loadSuperGroupInfoFor: aChat with: aSupergroupId
 			'supergroup_id'->aSupergroupId.
 			'@extra'->aSupergroupId}).
 
-	self app
+	self core
 		registerCallback: [:aSupergroupFullInfoEvent |
 			aChat
 				memberCount: (aSupergroupFullInfoEvent at: 'member_count');

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/core.st

@@ -1,4 +1,4 @@
 events
 openNewChat: aChatEvent
 
-	self app chats triggerEvent: #openNewChat with: (TCCChat newFromChatEvent: aChatEvent).
+	self core chats triggerEvent: #openNewChat with: (TCCChat newFromChatEvent: aChatEvent).

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/getChatHistoryFrom.with.limit..st

@@ -1,8 +1,8 @@
 event handling
 updateChatPosition: anEvent
 
-	(self app chats getChat: (anEvent at: 'chat_id'))
+	(self core chats getChat: (anEvent at: 'chat_id'))
 		position: ((anEvent at: 'position') at: 'order');
 		positionKnown: true.
 
-	self app chats notify.
+	self core chats notify.

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadBasicGroupInfoFor.with..st

@@ -5,7 +5,7 @@ updateLastMessage: anEvent
 
 	(anEvent includesKey: 'last_message') ifTrue: [
 		content := (anEvent at: 'last_message') at: 'content'.
-		chat := self app chats getChat: (anEvent at: 'chat_id').
+		chat := self core chats getChat: (anEvent at: 'chat_id').
 
 		(anEvent at: 'positions') notEmpty
 			ifTrue: [chat position:
@@ -17,4 +17,4 @@ updateLastMessage: anEvent
 			ifTrue: [chat lastMessage: ((content at: 'text') at: 'text')]
 			ifFalse: [chat lastMessage: 'message type not supported yet'].
 
-		self app chats notify].
+		self core chats notify].

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadSuperGroupInfoFor.with..st

@@ -2,22 +2,22 @@
 	"class" : {
 		 },
 	"instance" : {
-		"addChat:" : "JB 5/31/2021 15:05",
-		"addNewMessage:from:" : "pk 5/17/2021 19:10",
-		"app" : "5/11/2021 10:09:15",
-		"app:" : "pk 5/17/2021 19:11",
-		"chatHistoryReceived:" : "pk 5/12/2021 12:35",
-		"client" : "js 6/1/2020 14:44",
+		"addChat:" : "per 5/21/2021 16:55",
+		"addNewMessage:from:" : "per 5/21/2021 16:55",
+		"chatHistoryReceived:" : "per 5/21/2021 16:55",
+		"client" : "per 5/21/2021 16:55",
+		"core" : "per 5/21/2021 16:55",
+		"core:" : "per 5/21/2021 16:55",
 		"defaultMessageLimit" : "js 8/1/2020 18:24",
-		"getChatHistoryFrom:with:limit:" : "js 8/2/2020 13:17",
+		"getChatHistoryFrom:with:limit:" : "per 5/21/2021 16:55",
 		"getChats" : "js 7/31/2020 22:50",
 		"handleNewMessage:from:" : "pk 5/17/2021 18:28",
-		"loadBasicGroupInfoFor:with:" : "JB 5/31/2021 15:09",
-		"loadSuperGroupInfoFor:with:" : "JB 5/31/2021 15:10",
+		"loadBasicGroupInfoFor:with:" : "TR 6/2/2021 13:59",
+		"loadSuperGroupInfoFor:with:" : "TR 6/2/2021 13:58",
 		"openNewChat:" : "pk 5/13/2021 12:45",
 		"remainingMessages" : "5/11/2021 10:09:15",
 		"remainingMessages:" : "js 8/1/2020 16:50",
 		"searchChat:" : "f.w. 7/15/2020 22:53",
 		"sendMessage:to:" : "js 7/31/2020 14:39",
-		"updateChatPosition:" : "RS 5/10/2021 20:09",
-		"updateLastMessage:" : "RS 5/10/2021 20:41" } }
+		"updateChatPosition:" : "per 5/21/2021 16:55",
+		"updateLastMessage:" : "per 5/21/2021 16:55" } }

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/openNewChat..st

@@ -6,8 +6,8 @@
 		 ],
 	"commentStamp" : "js 6/13/2020 16:26",
 	"instvars" : [
-		"app",
-		"remainingMessages" ],
+		"remainingMessages",
+		"core" ],
 	"name" : "TCCChatsHandler",
 	"pools" : [
 		 ],

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateChatPosition..st

@@ -3,6 +3,6 @@ initializeHandlers
 
 	self
 		authHandler: (TCCAuthHandler new
-			app: self);
+			core: self);
 		chatsHandler: (TCCChatsHandler new
-			app: self).
+			core: self).

packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateLastMessage..st

@@ -18,7 +18,7 @@
 		"handleMessageEvent:" : "pk 5/19/2021 11:29",
 		"handlePendingEvent:" : "per 5/26/2021 14:03",
 		"initialize" : "pk 5/13/2021 09:33",
-		"initializeHandlers" : "js 8/1/2020 18:09",
+		"initializeHandlers" : "per 5/21/2021 16:55",
 		"isClientAlive" : "js 5/28/2020 17:18",
 		"loggedInUserID" : "rs 7/5/2020 14:48",
 		"loggedInUserID:" : "rs 7/5/2020 14:48",

packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json

@@ -7,4 +7,4 @@ testExtraAPIAttribute
 	self core pendingRequests at: callbackID put: [:anEvent | event := anEvent].
 	self core client send: (TCCRequest newWithType: 'getMe' from: {'@extra' -> callbackID}).
 	10 seconds wait.
-	self assert: (callbackID = (event at: '@extra'))
+	self assert: callbackID equals: (event at: '@extra')

packages/TelegramClient-Core.package/TCCChatsHandler.class/properties.json

@@ -7,4 +7,4 @@
 		"defaultTimeout" : "pk 5/15/2021 11:42",
 		"setUp" : "pk 5/15/2021 11:42",
 		"tearDown" : "pk 5/15/2021 11:42",
-		"testExtraAPIAttribute" : "per 5/15/2021 12:27" } }
+		"testExtraAPIAttribute" : "per 5/21/2021 16:34" } }

packages/TelegramClient-Core.package/TCCCore.class/instance/initializeHandlers.st

@@ -2,4 +2,4 @@ testing
 testAddNewestMessage
 
 	self chat addNewestMessage: (TCCMessage new message: 'test').
-	self assert: self chat messages second message equals: 'test'.
+	self assert: 'test' equals: self chat messages second message.

packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json

@@ -2,4 +2,4 @@ testing
 testAddOldestMessage
 
 	self chat addOldestMessage: (TCCMessage new message: 'test').
-	self assert: self chat messages last message equals: 'test'.
+	self assert: 'test' equals: self chat messages last message.

packages/TelegramClient-Tests.package/TCTAPITests.class/instance/testExtraAPIAttribute.st

@@ -2,4 +2,4 @@ testing
 testID
 
 	self chat id: 15.
-	self assert: self chat id equals: 15.
+	self assert: 15 equals: self chat id.

packages/TelegramClient-Tests.package/TCTAPITests.class/methodProperties.json

@@ -2,4 +2,4 @@ testing
 testLastMessage
 
 	self chat lastMessage: 'test'.
-	self assert: self chat lastMessage equals: 'test'.
+	self assert: 'test' equals: self chat lastMessage.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testAddNewestMessage.st

@@ -13,8 +13,8 @@ testMessage
 			'@type' -> 'messageText'.
 			'text' -> (Dictionary newFrom: {
 				'text' -> 'testText'})})})) in: self chat.
-	self assert: message senderID equals: '2'.
-	self assert: message id equals: '3'.
-	self assert: message date asUTC asTime hhmm24 equals: '0000'.
-	self assert: message message equals: 'testText'.
-	self assert: (self chat id) equals: message chatID
+	self assert: '2' equals: message senderID.
+	self assert: '3' equals: message id.
+	self assert: '0000' equals: message date asUTC asTime hhmm24.
+	self assert: 'testText' equals: message message.
+	self assert: message chatID equals: (self chat id)

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testAddOldestMessage.st

@@ -6,4 +6,4 @@ testMessages
 	collection := OrderedCollection newFrom: {TCCMessage new. TCCMessage new}.
 
 	self chat messages: collection.
-	self assert: self chat messages equals: collection.
+	self assert: collection equals: self chat messages.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testID.st

@@ -1,4 +1,4 @@
 testing
 testMessagesSize
 
-	self assert: self chat numberOfMessages equals: 5.
+	self assert: 5 equals: self chat numberOfMessages.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testLastMessage.st

@@ -2,4 +2,4 @@ testing
 testPosition
 
 	self chat position: 5.
-	self assert: self chat position equals: 5.
+	self assert: 5 equals: self chat position.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testMessage.st

@@ -3,4 +3,4 @@ testPositionKnown
 
 	self assert: self chat positionKnown not.
 	self chat positionKnown: true.
-	self assert: self chat positionKnown equals: true.
+	self assert: true equals: self chat positionKnown.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testMessages.st

@@ -3,10 +3,10 @@ testStillRequestedMessages
 
 	self chat numberOfRequestedMessages: 10.
 
-	self assert: self chat stillRequestedMessages equals: 5.
+	self assert: 5 equals: self chat stillRequestedMessages.
 
 	self chat requestMessages: 20.
-	self assert: self chat stillRequestedMessages equals: 20.
+	self assert: 20 equals: self chat stillRequestedMessages.
 
 	self chat addOldestMessage: TCCMessage new.
-	self assert: self chat stillRequestedMessages equals: 19.
+	self assert: 19 equals: self chat stillRequestedMessages.

packages/TelegramClient-Tests.package/TCTChatTests.class/instance/testMessagesSize.st

@@ -2,4 +2,4 @@ testing
 testTitle
 
 	self chat title: 'testing'.
-	self assert: self chat title equals: 'testing'.
+	self assert: 'testing' equals: self chat title.