Rename UserStore (#406)

* rename UserStore, add some tests and rename linter method * fix failed rename operation on squeaks behalf
hpi-swa-teaching · Jun 26, 2021 · 9557bb5 · 9557bb5
1 parent 8ab9159
commit 9557bb5
Show file tree

Hide file tree

Showing 29 changed files with 87 additions and 35 deletions.
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCCore.class/instance/initialize.st
@@ -7,7 +7,7 @@ initialize
 		chats: TCCChats newWithDefaultSorting;
 		loggedInUserID: 0;
 		pendingRequests: Dictionary new;
-		users: (TCCUsers newWith: self);
+		users: (TCCUserStore newWith: self);
 		imageStore: (TCCImageStore newWith: self);
 		callbackCounter: 0.
 

diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json
@@ -24,7 +24,7 @@
 		"handlePendingEvent:" : "5/30/2021 12:11:04",
 		"imageStore" : "pk 6/19/2021 17:15",
 		"imageStore:" : "TR 6/22/2021 09:33",
-		"initialize" : "pk 6/19/2021 17:21",
+		"initialize" : "RS 6/23/2021 15:29",
 		"initializeHandlers" : "js 8/1/2020 18:09",
 		"isClientAlive" : "js 5/28/2020 17:18",
 		"loggedInUserID" : "rs 7/5/2020 14:48",

diff --git a/...ent-Core.package/TCCUsers.class/README.md → ...Core.package/TCCUserStore.class/README.md b/...ent-Core.package/TCCUsers.class/README.md → ...Core.package/TCCUserStore.class/README.md
diff --git a/....package/TCCUsers.class/class/newWith..st → ...kage/TCCUserStore.class/class/newWith..st b/....package/TCCUsers.class/class/newWith..st → ...kage/TCCUserStore.class/class/newWith..st
diff --git a/....package/TCCUsers.class/instance/core..st → ...kage/TCCUserStore.class/instance/core..st b/....package/TCCUsers.class/instance/core..st → ...kage/TCCUserStore.class/instance/core..st
diff --git a/...e.package/TCCUsers.class/instance/core.st → ...ckage/TCCUserStore.class/instance/core.st b/...e.package/TCCUsers.class/instance/core.st → ...ckage/TCCUserStore.class/instance/core.st
diff --git a/...ge/TCCUsers.class/instance/getUserFor..st → ...CCUserStore.class/instance/getUserFor..st b/...ge/TCCUsers.class/instance/getUserFor..st → ...CCUserStore.class/instance/getUserFor..st
diff --git a/...rs.class/instance/requestUserFor.with..st → ...re.class/instance/requestUserFor.with..st b/...rs.class/instance/requestUserFor.with..st → ...re.class/instance/requestUserFor.with..st
@@ -6,4 +6,4 @@ requestUserFor: aUserId with: aPromise
 		registerCallback:
 			[:userEvent | aPromise resolveWith: (TCCUser newFrom: userEvent)].
 
-	self core requestUser: aUserId with: callbackID
+	self core requestUser: aUserId with: callbackID.
diff --git a/...kage/TCCUsers.class/methodProperties.json → .../TCCUserStore.class/methodProperties.json b/...kage/TCCUsers.class/methodProperties.json → .../TCCUserStore.class/methodProperties.json
@@ -5,4 +5,4 @@
 		"core" : "RK 5/19/2021 10:34",
 		"core:" : "TR 6/15/2021 16:52",
 		"getUserFor:" : "pk 6/19/2021 17:48",
-		"requestUserFor:with:" : "pk 6/19/2021 17:48" } }
+		"requestUserFor:with:" : "RS 6/23/2021 15:41" } }
diff --git a/...re.package/TCCUsers.class/properties.json → ...ackage/TCCUserStore.class/properties.json b/...re.package/TCCUsers.class/properties.json → ...ackage/TCCUserStore.class/properties.json
@@ -7,7 +7,7 @@
 	"commentStamp" : "RK 5/19/2021 09:58",
 	"instvars" : [
 		"core" ],
-	"name" : "TCCUsers",
+	"name" : "TCCUserStore",
 	"pools" : [
 		 ],
 	"super" : "Dictionary",

diff --git a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testCanRequestUser.st b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testCanRequestUser.st
@@ -0,0 +1,19 @@
+testing
+testCanRequestUser
+
+	| callbackID user |
+
+	user := nil.
+
+	callbackID := self sharedCore
+		registerCallback:
+			[:userEvent | user := TCCUser newFrom: userEvent].
+
+	self sharedCore requestUser: self sharedCore loggedInUserID with: callbackID.
+	1 second wait.
+
+	self assert: user notNil.
+	self assert: self sharedCore loggedInUserID equals: user id.
+	self assert: user firstName isString.
+	self assert: user lastName isString.
+	self assert: user username isString.
diff --git a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
+		"testCanRequestUser" : "RS 6/23/2021 15:49",
 		"testExtraAPIAttribute" : "RS 6/6/2021 10:50",
 		"testMessageSending" : "RS 6/6/2021 10:54",
 		"testPositionIsUpdatedAfterInitialChatLoading" : "RS 6/13/2021 17:02" } }
diff --git a/...egramClientTests-Core.package/TCTCCoreTests.class/instance/partialGroupMembersTestFor..st b/...egramClientTests-Core.package/TCTCCoreTests.class/instance/partialGroupMembersTestFor..st
@@ -1,7 +1,7 @@
 testing
 partialGroupMembersTestFor: aChat
 
-	self core users: TCTMMocks mockUserPromises.
+	self core users: TCTMMocks mockUserStore.
 	aChat core: self core.
 	aChat loadInfo.
 	1 seconds wait.

diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json
@@ -3,7 +3,7 @@
 		 },
 	"instance" : {
 		"newMessageReceived:" : "pk 5/17/2021 19:20",
-		"partialGroupMembersTestFor:" : "TR 6/13/2021 15:19",
+		"partialGroupMembersTestFor:" : "RS 6/23/2021 16:00",
 		"receivedMessage" : "TR 6/2/2021 15:46",
 		"receivedMessage:" : "TR 6/2/2021 15:47",
 		"testAuthConstants" : "js 8/2/2020 22:54",

diff --git a/...TelegramClientTests-Core.package/TCTCImageStoreTests.class/instance/testCachesRequests.st b/...TelegramClientTests-Core.package/TCTCImageStoreTests.class/instance/testCachesRequests.st
@@ -0,0 +1,16 @@
+testing
+testCachesRequests
+
+	| path1 path2 |
+	self mockTeleClient onRequestType: 'downloadFile' respond: TCTMMocks mockImageResponseJson.
+
+	[self core imageStore getFormFor: TCTMMocks mockImageId.] fork.
+	1 seconds wait.
+	path1 := (self core imageStore at: TCTMMocks mockImageId) value.
+
+	[self core imageStore getFormFor: TCTMMocks mockImageId.] fork.
+	1 seconds wait.
+	path2 := (self core imageStore at: TCTMMocks mockImageId) value.
+
+	self assert: path1 equals: path2.
+	self assert: 1 equals: self core imageStore size.
diff --git a/packages/TelegramClientTests-Core.package/TCTCImageStoreTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCImageStoreTests.class/methodProperties.json
@@ -3,6 +3,7 @@
 		 },
 	"instance" : {
 		"setUp" : "pk 6/19/2021 17:37",
+		"testCachesRequests" : "RS 6/23/2021 15:51",
 		"testCanGetImageForm" : "pk 6/19/2021 17:02",
 		"testCanGetImagePath" : "pk 6/19/2021 17:24",
 		"testDidCreateFile" : "pk 6/19/2021 17:35" } }
diff --git a/...re.package/TCTCUsersTests.class/README.md → ...ackage/TCTCUserStoreTests.class/README.md b/...re.package/TCTCUsersTests.class/README.md → ...ackage/TCTCUserStoreTests.class/README.md
diff --git a/.../TelegramClientTests-Core.package/TCTCUserStoreTests.class/instance/testCachesRequests.st b/.../TelegramClientTests-Core.package/TCTCUserStoreTests.class/instance/testCachesRequests.st
@@ -0,0 +1,17 @@
+testing
+testCachesRequests
+
+	| user1 user2 |
+	user1 := nil.
+	user2 := nil.
+
+	self mockTeleClient onRequestType: 'getUser' respond: TCTMMocks mockUserJson1.
+
+	[user1 := self core users getUserFor: TCTMMocks mockUser1 id.] fork.
+	1 seconds wait.
+
+	self assert: user1 notNil.
+	[user2 := self core users getUserFor: TCTMMocks mockUser1 id.] fork.
+	1 seconds wait.
+
+	self assert: user1 == user2.
diff --git a/...ages/TelegramClientTests-Core.package/TCTCUserStoreTests.class/instance/testGetUserFor.st b/...ages/TelegramClientTests-Core.package/TCTCUserStoreTests.class/instance/testGetUserFor.st
@@ -0,0 +1,12 @@
+testing
+testGetUserFor
+
+	| user |
+	user := nil.
+
+	self mockTeleClient onRequestType: 'getUser' respond: TCTMMocks mockUserJson1.
+
+	[user := self core users getUserFor: TCTMMocks mockUser1 id.] fork.
+	1 seconds wait.
+
+	self assert: TCTMMocks mockUser1 equals: user.
diff --git a/packages/TelegramClientTests-Core.package/TCTCUserStoreTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCUserStoreTests.class/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"testCachesRequests" : "RS 6/23/2021 15:35",
+		"testGetUserFor" : "RS 6/23/2021 15:32" } }
diff --git a/...kage/TCTCUsersTests.class/properties.json → .../TCTCUserStoreTests.class/properties.json b/...kage/TCTCUsersTests.class/properties.json → .../TCTCUserStoreTests.class/properties.json
@@ -7,7 +7,7 @@
 	"commentStamp" : "RK 5/19/2021 10:18",
 	"instvars" : [
 		 ],
-	"name" : "TCTCUsersTests",
+	"name" : "TCTCUserStoreTests",
 	"pools" : [
 		 ],
 	"super" : "TCTCNoTdlibTestCase",

diff --git a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st
diff --git a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json
diff --git a/...nstance/testMethodNotTooManyEmptyLines.st → ...ance/testMethodNoConsecutiveEmptyLines.st b/...nstance/testMethodNotTooManyEmptyLines.st → ...ance/testMethodNoConsecutiveEmptyLines.st
@@ -1,5 +1,5 @@
 tests
-testMethodNotTooManyEmptyLines
+testMethodNoConsecutiveEmptyLines
 
 	self methodsLinesDo: [:lines |
 		1 to: lines size -1 do: [:index |

diff --git a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json
@@ -23,10 +23,10 @@
 		"testLongMethods" : "JB 6/10/2021 22:45",
 		"testMethodHasEmptyLine" : "j 7/16/2020 12:29",
 		"testMethodNameIsLowerCase" : "JB 6/13/2021 10:53",
+		"testMethodNoConsecutiveEmptyLines" : "RS 6/23/2021 15:53",
 		"testMethodNoEmptyLineAtEnd" : "j 7/16/2020 12:32",
 		"testMethodNoTrailingWhitespaces" : "JB 6/10/2021 22:45",
 		"testMethodNoTwoWhitespacesNextToEachOther" : "js 6/13/2020 18:56",
-		"testMethodNotTooManyEmptyLines" : "js 6/13/2020 18:36",
 		"testMethodParamsHaveMeaningfulNames" : "RS 6/6/2021 11:58",
 		"testNoClassComments" : "js 6/13/2020 17:09",
 		"testNoDotAfterReturn" : "js 6/13/2020 18:09",

diff --git a/...TCTMMocks.class/class/mockUserPromises.st → ...ge/TCTMMocks.class/class/mockUserStore.st b/...TCTMMocks.class/class/mockUserPromises.st → ...ge/TCTMMocks.class/class/mockUserStore.st
@@ -1,7 +1,7 @@
 user
-mockUserPromises
+mockUserStore
 
-	^ TCCUsers newFrom: {
+	^ TCCUserStore newFrom: {
 		self mockUser1 id -> (Promise new resolveWith: self mockUser1).
 		self mockUser2 id -> (Promise new resolveWith: self mockUser2)
 	}
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json
@@ -28,7 +28,7 @@
 		"mockUserEvent" : "per 6/10/2021 19:30",
 		"mockUserJson1" : "per 6/10/2021 19:43",
 		"mockUserJson2" : "per 6/10/2021 19:29",
-		"mockUserPromises" : "per 6/15/2021 09:21",
+		"mockUserStore" : "RS 6/23/2021 16:00",
 		"mockUsers" : "TR 6/13/2021 15:15",
 		"writeMockImage" : "pk 6/19/2021 17:36" },
 	"instance" : {

diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st
@@ -3,5 +3,5 @@ setUp
 
 	self core: (TCTUMockCore newWithTeleClient: TCTMMockTeleClient new).
 	self core chats: TCTMMocks mockChats.
-	self core users: TCTMMocks mockUserPromises.
+	self core users: TCTMMocks mockUserStore.
 	self wantsToTest: (TCUMain newWithCore: self core).
diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json
@@ -18,7 +18,7 @@
 		"findByTextContent:in:" : "RS 5/31/2021 07:55",
 		"forceSaveScreenshotOf:as:in:" : "RS 5/26/2021 13:29",
 		"seeing:in:" : "per 6/15/2021 09:29",
-		"setUp" : "TR 6/13/2021 15:39",
+		"setUp" : "RS 6/23/2021 16:00",
 		"takeScreenshotOf:" : "JB 5/24/2021 16:21",
 		"tearDown" : "RS 6/25/2021 12:38",
 		"waitUntil:" : "RS 6/6/2021 13:00" } }