changed label, added tests for UnreadButton

hpi-swa-teaching · May 22, 2022 · 8479a74 · 8479a74
1 parent b4d80d1
commit 8479a74
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/packages/IMAPClient-Tests.package/ICFolderTest.class/instance/testUnreadButton.st b/packages/IMAPClient-Tests.package/ICFolderTest.class/instance/testUnreadButton.st
@@ -0,0 +1,13 @@
+sort/filter
+testUnreadButton
+
+	| dialog |
+
+dialog := ICFolderDialog new.
+
+self assert: dialog showUnread equals: false.
+
+dialog filterEmailsUnread.
+
+self assert: dialog showUnread equals: true.
+
diff --git a/...ages/IMAPClient-Tests.package/ICFolderTest.class/instance/testUnreadButtonEmailVisible.st b/...ages/IMAPClient-Tests.package/ICFolderTest.class/instance/testUnreadButtonEmailVisible.st
@@ -0,0 +1,22 @@
+sort/filter
+testUnreadButtonEmailVisible
+
+
+	| dialog email |
+
+dialog := ICFolderDialog new.
+email := (ICEmail new) 
+				uniqueID: self uniqueIds first; 
+				folder: self root;
+				date: self class date;
+				seen: false.
+
+self assert: (dialog shouldEmailBeVisible: email) equals: true.
+
+dialog filterEmailsUnread.
+
+self assert: (dialog shouldEmailBeVisible: email) equals: true.
+
+email seen: true.
+self assert: (dialog shouldEmailBeVisible: email) equals: false.
+
diff --git a/packages/IMAPClient-Tests.package/ICFolderTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICFolderTest.class/methodProperties.json
@@ -28,5 +28,7 @@
 		"testRootFolderHashName" : "JST 6/6/2021 18:43",
 		"testSortedChildren" : "FK 5/16/2022 17:52",
 		"testSortedChildrenEmpty" : "FK 5/16/2022 17:54",
+		"testUnreadButton" : "an 5/22/2022 17:25",
+		"testUnreadButtonEmailVisible" : "an 5/22/2022 17:26",
 		"testUpdate" : "eg 7/29/2021 17:14",
 		"uniqueIds" : "eg 7/27/2021 19:15" } }
diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/filterButtonLabelUnread.st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/filterButtonLabelUnread.st
@@ -3,4 +3,4 @@ filterButtonLabelUnread
 
 	self showUnread
 		ifTrue: [^ 'Unread']
-		ifFalse: [^ 'Read']
+		ifFalse: [^ 'All']
diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json
@@ -54,7 +54,7 @@
 		"emphasizeUnseenFolders:" : "LW 8/2/2020 16:17",
 		"emphasizeUnseenMessages:" : "hg 8/2/2020 15:42",
 		"expungeSelectedFolder" : "an 5/18/2022 11:23",
-		"filterButtonLabelUnread" : "an 5/22/2022 16:33",
+		"filterButtonLabelUnread" : "an 5/22/2022 17:28",
 		"filterEmailsUnread" : "an 5/22/2022 16:55",
 		"filterString" : "lvm 6/26/2018 14:05",
 		"filterString:" : "fr 6/3/2019 15:50",