Skip to content

Commit 61452b1

Browse files
tanja04tanja04
committed
refactored instance variables + tests
1 parent 454ca05 commit 61452b1

20 files changed

+243
-190
lines changed

‎src/SpotifyConnect/SPOCApiEndpointResult.class.st

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Class {
55
#name : #SPOCApiEndpointResult,
66
#superclass : #Object,
77
#instVars : [
8-
'code',
98
'error',
109
'response'
1110
],

‎src/SpotifyConnect/SPOCBoxedText.class.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ Class {
55
#name : #SPOCBoxedText,
66
#superclass : #Morph,
77
#instVars : [
8-
'label',
9-
'content',
10-
'contents'
8+
'contents',
9+
'label'
1110
],
1211
#category : #'SpotifyConnect-UI',
1312
#'squeak_changestamp' : 'OW 7/4/2024 12:29'

‎src/SpotifyConnect/SPOCClickable.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Class {
55
#name : #SPOCClickable,
66
#superclass : #Morph,
77
#instVars : [
8-
'wrappee',
9-
'onClick'
8+
'onClick',
9+
'wrappee'
1010
],
1111
#category : #'SpotifyConnect-UI',
1212
#'squeak_changestamp' : 'OW 7/4/2024 12:29'

‎src/SpotifyConnect/SPOCCurrentlyPlaying.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Class {
55
#name : #SPOCCurrentlyPlaying,
66
#superclass : #SPOCUIComponent,
77
#instVars : [
8-
'track',
9-
'item'
8+
'item',
9+
'track'
1010
],
1111
#category : #'SpotifyConnect-UI',
1212
#'squeak_changestamp' : 'OW 7/4/2024 12:10'

‎src/SpotifyConnect/SPOCDataPiece.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Class {
55
#name : #SPOCDataPiece,
66
#superclass : #Object,
77
#instVars : [
8+
'hasTertiaryText',
89
'id',
910
'image',
10-
'name',
11-
'hasTertiaryText'
11+
'name'
1212
],
1313
#category : #SpotifyConnect,
1414
#'squeak_changestamp' : 'OW 7/4/2024 12:29'

‎src/SpotifyConnect/SPOCRecentlyPlayed.class.st

+12-32
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Class {
55
#name : #SPOCRecentlyPlayed,
66
#superclass : #SPOCUIComponent,
77
#instVars : [
8-
'tracks',
9-
'trackItems'
8+
'results'
109
],
1110
#category : #'SpotifyConnect-UI',
1211
#'squeak_changestamp' : 'OW 7/4/2024 12:12'
@@ -43,67 +42,48 @@ SPOCRecentlyPlayed >> attachButton [
4342

4443
{
4544
#category : #'api-call',
46-
#'squeak_changestamp' : 'VE 7/2/2024 18:56'
45+
#'squeak_changestamp' : 'TL 7/11/2024 12:03'
4746
}
4847
SPOCRecentlyPlayed >> getRecentlyPlayed [
4948

5049
| apiEndpoint |
51-
self isDisabled ifTrue: [self showPopUp. ^ self].
52-
apiEndpoint := SPOCApiRecentlyPlayed new
53-
authorizer: self app auth;
54-
yourself.
55-
self results: (apiEndpoint getRecentlyPlayed).
50+
self isDisabled
51+
ifTrue: [self showPopUp.
52+
^ self].
53+
apiEndpoint := SPOCApiRecentlyPlayed new authorizer: self app auth.
54+
self results: apiEndpoint getRecentlyPlayed.
5655
self app resultList updateResults: self results;
5756
title: 'Recently Played'
5857
]
5958

6059
{
6160
#category : #initialization,
62-
#'squeak_changestamp' : 'TL 7/8/2024 19:39'
61+
#'squeak_changestamp' : 'TL 7/11/2024 11:59'
6362
}
6463
SPOCRecentlyPlayed >> initialize [
6564

6665
super initialize.
6766

6867
self color: Color transparent;
69-
items: OrderedCollection new;
7068
results: OrderedCollection new;
7169
attachButton;
7270
extendFully
7371
]
7472

7573
{
7674
#category : #accessing,
77-
#'squeak_changestamp' : 'TL 7/8/2024 19:16'
78-
}
79-
SPOCRecentlyPlayed >> items [
80-
81-
^ trackItems
82-
]
83-
84-
{
85-
#category : #accessing,
86-
#'squeak_changestamp' : 'TL 7/8/2024 19:16'
87-
}
88-
SPOCRecentlyPlayed >> items: anObject [
89-
90-
trackItems := anObject
91-
]
92-
93-
{
94-
#category : #accessing,
95-
#'squeak_changestamp' : 'TL 7/8/2024 19:16'
75+
#'squeak_changestamp' : 'TL 7/11/2024 12:02'
9676
}
9777
SPOCRecentlyPlayed >> results [
9878

99-
^ tracks
79+
^ results
10080
]
10181

10282
{
10383
#category : #accessing,
104-
#'squeak_changestamp' : 'TL 7/8/2024 19:16'
84+
#'squeak_changestamp' : 'TL 7/11/2024 12:02'
10585
}
10686
SPOCRecentlyPlayed >> results: anObject [
10787

108-
tracks := anObject
88+
results := anObject
10989
]

‎src/SpotifyConnect/SPOCResultList.class.st

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Class {
55
#name : #SPOCResultList,
66
#superclass : #SPOCUIComponent,
77
#instVars : [
8-
'title',
9-
'titleMorph',
10-
'results',
118
'items',
12-
'scrollablePanel'
9+
'results',
10+
'scrollablePanel',
11+
'title',
12+
'titleMorph'
1313
],
1414
#category : #'SpotifyConnect-UI',
1515
#'squeak_changestamp' : 'OW 7/4/2024 12:12'

‎src/SpotifyConnect/SPOCResultListItem.class.st

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ Class {
1010
'image',
1111
'primaryText',
1212
'secondaryText',
13-
'tertiaryText',
14-
'hasTertiaryText'
13+
'tertiaryText'
1514
],
1615
#category : #'SpotifyConnect-UI',
1716
#'squeak_changestamp' : 'OW 7/4/2024 12:30'

‎src/SpotifyConnect/SPOCScrollablePanel.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Class {
55
#name : #SPOCScrollablePanel,
66
#superclass : #Morph,
77
#instVars : [
8-
'items',
98
'builder',
9+
'items',
1010
'spec',
1111
'panel'
1212
],

‎src/SpotifyConnect/SPOCSearchbar.class.st

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ Class {
55
#name : #SPOCSearchbar,
66
#superclass : #SPOCUIComponent,
77
#instVars : [
8-
'inputField',
8+
'context',
9+
'filter',
910
'input',
10-
'results',
1111
'items',
12-
'filter',
13-
'context'
12+
'results'
1413
],
1514
#category : #'SpotifyConnect-UI',
1615
#'squeak_changestamp' : 'OW 7/4/2024 12:14'

‎src/SpotifyConnect/SPOCSlider.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Class {
55
#name : #SPOCSlider,
66
#superclass : #Morph,
77
#instVars : [
8-
'value',
98
'innerBarColor',
109
'innerBarHoverColor',
11-
'onValueChanged'
10+
'onValueChanged',
11+
'value'
1212
],
1313
#category : #'SpotifyConnect-UI',
1414
#'squeak_changestamp' : 'OW 7/4/2024 12:30'

‎src/SpotifyConnect/SPOCTestApiEndpoint.class.st

+23-5
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,40 @@ Class {
1111
#'squeak_changestamp' : 'OW 7/4/2024 12:25'
1212
}
1313

14+
{
15+
#category : #accessing,
16+
#'squeak_changestamp' : 'TL 7/11/2024 12:38'
17+
}
18+
SPOCTestApiEndpoint >> apiEndpoint [
19+
20+
^ apiEndpoint
21+
]
22+
23+
{
24+
#category : #accessing,
25+
#'squeak_changestamp' : 'TL 7/11/2024 12:38'
26+
}
27+
SPOCTestApiEndpoint >> apiEndpoint: anObject [
28+
29+
apiEndpoint := anObject
30+
]
31+
1432
{
1533
#category : #setup,
16-
#'squeak_changestamp' : 'VE 6/23/2024 18:22'
34+
#'squeak_changestamp' : 'TL 7/11/2024 12:38'
1735
}
1836
SPOCTestApiEndpoint >> setUp [
1937

20-
apiEndpoint := SPOCApiEndpoint new
38+
self apiEndpoint: SPOCApiEndpoint new
2139
]
2240

2341
{
2442
#category : #testing,
25-
#'squeak_changestamp' : 'VE 6/23/2024 18:23'
43+
#'squeak_changestamp' : 'TL 7/11/2024 12:38'
2644
}
2745
SPOCTestApiEndpoint >> testNoAuthenticator [
2846

2947
| res |
30-
res := apiEndpoint execute: (Dictionary new).
31-
self assert: (res isKindOf: SPOCApiEndpointResult)
48+
res := self apiEndpoint execute: Dictionary new.
49+
self assert: res class = SPOCApiEndpointResult
3250
]

‎src/SpotifyConnect/SPOCTestArtistsStringFormatting.class.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ SPOCTestArtistsStringFormatting >> setUpAlbum [
9696

9797
{
9898
#category : #testing,
99-
#'squeak_changestamp' : 'TL 6/23/2024 15:11'
99+
#'squeak_changestamp' : 'TL 7/11/2024 12:37'
100100
}
101101
SPOCTestArtistsStringFormatting >> testArtistsAsString [
102102

103-
self assert: (self album artistsAsString = self artistsString)
103+
self assert: self album artistsAsString = self artistsString
104104
]

‎src/SpotifyConnect/SPOCTestAuthorizer.class.st

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ Tests for logic of the authorizer.
44
Class {
55
#name : #SPOCTestAuthorizer,
66
#superclass : #TestCase,
7-
#instVars : [
8-
'authorizer'
9-
],
107
#category : #'SpotifyConnect-Auth-Tests',
118
#'squeak_changestamp' : 'OW 7/4/2024 12:17'
129
}

‎src/SpotifyConnect/SPOCTestClickable.class.st

+10-17
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,17 @@ Class {
88
#'squeak_changestamp' : 'OW 7/4/2024 12:26'
99
}
1010

11-
{
12-
#category : #setup,
13-
#'squeak_changestamp' : 'VE 5/27/2024 17:13'
14-
}
15-
SPOCTestClickable >> setUp [
16-
]
17-
1811
{
1912
#category : #testing,
20-
#'squeak_changestamp' : 'TL 6/10/2024 05:03'
13+
#'squeak_changestamp' : 'TL 7/11/2024 12:37'
2114
}
2215
SPOCTestClickable >> testClickableAction [
2316

24-
| clickable tmp |
25-
tmp := 0.
26-
clickable := SPOCClickable newUsing: Morph new onClick: [:anEvent | tmp := 1].
17+
| clickable value |
18+
value := 0.
19+
clickable := SPOCClickable newUsing: Morph new onClick: [:anEvent | value := 1].
2720
clickable mouseDown: nil.
28-
self assert: tmp = 1
21+
self assert: value = 1
2922
]
3023

3124
{
@@ -41,12 +34,12 @@ SPOCTestClickable >> testClickableActionNotSet [
4134

4235
{
4336
#category : #testing,
44-
#'squeak_changestamp' : 'TL 6/10/2024 05:04'
37+
#'squeak_changestamp' : 'TL 7/11/2024 12:36'
4538
}
4639
SPOCTestClickable >> testWrappeeSubmorph [
4740

48-
| clickable tmpMorph |
49-
tmpMorph := Morph new.
50-
clickable := SPOCClickable newUsing: tmpMorph onClick: nil.
51-
self assert: (clickable submorphs includes: tmpMorph)
41+
| clickable morph |
42+
morph := Morph new.
43+
clickable := SPOCClickable newUsing: morph onClick: nil.
44+
self assert: (clickable submorphs includes: morph)
5245
]

‎src/SpotifyConnect/SPOCTestDeviceMorphConstructor.class.st

+10-12
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,29 @@ SPOCTestDeviceMorphConstructor >> deviceMorph: anObject [
5050

5151
{
5252
#category : #setup,
53-
#'squeak_changestamp' : 'TL 7/8/2024 20:20'
53+
#'squeak_changestamp' : 'TL 7/11/2024 12:33'
5454
}
5555
SPOCTestDeviceMorphConstructor >> setUp [
5656

57-
self device: (SPOCDevice new
58-
type: 'Smart Fridge';
57+
self device: (SPOCDevice new type: 'Smart Fridge';
5958
name: 'Samsung Fridge';
6059
isActive: true;
6160
yourself);
62-
deviceMorph: (SPOCSwitchDevice new
63-
buildResultMorphFrom: self device)
61+
deviceMorph: (SPOCSwitchDevice new buildResultMorphFrom: self device)
6462
]
6563

6664
{
6765
#category : #testing,
68-
#'squeak_changestamp' : 'TL 6/23/2024 14:30'
66+
#'squeak_changestamp' : 'TL 7/11/2024 12:31'
6967
}
7068
SPOCTestDeviceMorphConstructor >> testMorphClass [
7169

72-
self assert: (self deviceMorph class = SPOCClickable)
70+
self assert: self deviceMorph class = SPOCClickable
7371
]
7472

7573
{
7674
#category : #testing,
77-
#'squeak_changestamp' : 'TL 6/23/2024 14:31'
75+
#'squeak_changestamp' : 'TL 7/11/2024 12:32'
7876
}
7977
SPOCTestDeviceMorphConstructor >> testSubMorphs [
8078

@@ -83,8 +81,8 @@ SPOCTestDeviceMorphConstructor >> testSubMorphs [
8381
typeText := finishedMorph submorphs first.
8482
nameText := finishedMorph submorphs at: 2.
8583
background := finishedMorph submorphs at: 3.
86-
self assert: (background color = SPOCStyle spotifyGray).
87-
self assert: (nameText text = 'Samsung Fridge').
88-
self assert: (typeText text = 'Smart Fridge').
89-
self assert: (nameText textColor = SPOCStyle spotifyGreen)
84+
self assert: typeText text = 'Smart Fridge'.
85+
self assert: nameText text = 'Samsung Fridge'.
86+
self assert: nameText textColor = SPOCStyle spotifyGreen.
87+
self assert: background color = SPOCStyle spotifyGray
9088
]

0 commit comments

Comments
 (0)