Skip to content

Commit b5433c0

Browse files
added more test
1 parent 39a186e commit b5433c0

File tree

6 files changed

+56
-20
lines changed

6 files changed

+56
-20
lines changed

app/build.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Jun 09 08:51:05 EDT 2018
2+
#Sat Jun 09 13:24:10 EDT 2018
33
version_minor=9
4-
version_build=0
5-
version_patch=1
4+
version_build=1
5+
version_patch=0
66
version_store=38
77
version_major=1

app/src/main/java/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,16 @@ public View makeViewDetailed(@NonNull WiFiDetail wiFiDetail) {
6969
setViewCompact(view, wiFiDetail, false);
7070
setViewExtra(view, wiFiDetail);
7171
setViewVendorLong(view, wiFiDetail.getWiFiAdditional());
72+
enableTextSelection(view);
7273

7374
return view;
7475
}
7576

77+
private void enableTextSelection(View view) {
78+
view.<TextView>findViewById(R.id.ssid).setTextIsSelectable(true);
79+
view.<TextView>findViewById(R.id.vendorLong).setTextIsSelectable(true);
80+
}
81+
7682
private void setViewCompact(@NonNull View view, @NonNull WiFiDetail wiFiDetail, boolean isChild) {
7783
Context context = view.getContext();
7884

app/src/main/res/layout/access_point_view_compact.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
<TextView
5252
android:id="@+id/ssid"
53-
android:textIsSelectable="true"
5453
android:layout_width="wrap_content"
5554
android:layout_height="wrap_content"
5655
android:textStyle="bold"/>

app/src/main/res/layout/access_point_view_complete.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060

6161
<TextView
6262
android:id="@+id/ssid"
63-
android:textIsSelectable="true"
6463
android:layout_width="wrap_content"
6564
android:layout_height="wrap_content"
6665
android:textStyle="bold"/>
@@ -100,7 +99,7 @@
10099
android:layout_height="wrap_content"
101100
android:orientation="vertical">
102101

103-
<!-- Row 2 -->
102+
<!-- Row 1 -->
104103
<LinearLayout
105104
android:layout_width="match_parent"
106105
android:layout_height="wrap_content"
@@ -140,7 +139,7 @@
140139
android:textStyle="bold"/>
141140
</LinearLayout>
142141

143-
<!-- Row 2 optional -->
142+
<!-- Row 2 -->
144143
<LinearLayout
145144
android:layout_width="match_parent"
146145
android:layout_height="wrap_content"
@@ -164,7 +163,6 @@
164163

165164
<TextView
166165
android:id="@+id/vendorShort"
167-
android:textIsSelectable="true"
168166
android:layout_width="wrap_content"
169167
android:layout_height="wrap_content"
170168
android:visibility="gone"/>

app/src/main/res/layout/access_point_view_popup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
<TextView
3434
android:id="@+id/vendorLong"
35-
android:textIsSelectable="true"
3635
android:layout_width="wrap_content"
3736
android:layout_height="wrap_content"
3837
android:visibility="gone"/>

app/src/test/java/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetailTest.java

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@
4444
import java.util.Locale;
4545

4646
import static org.junit.Assert.assertEquals;
47+
import static org.junit.Assert.assertFalse;
4748
import static org.junit.Assert.assertNotNull;
4849
import static org.junit.Assert.assertNull;
50+
import static org.junit.Assert.assertTrue;
4951
import static org.mockito.Mockito.when;
5052

5153
@RunWith(RobolectricTestRunner.class)
@@ -94,7 +96,7 @@ public void testMakeViewShouldUseGivenView() {
9496
}
9597

9698
@Test
97-
public void testMakeViewFullWithConfiguredImageVisible() {
99+
public void testMakeViewCompleteWithConfiguredImageVisible() {
98100
// setup
99101
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, true));
100102
// execute
@@ -104,7 +106,7 @@ public void testMakeViewFullWithConfiguredImageVisible() {
104106
}
105107

106108
@Test
107-
public void testMakeViewFullWithTabGone() {
109+
public void testMakeViewCompleteWithTabGone() {
108110
// setup
109111
WiFiAdditional wiFiAdditional = new WiFiAdditional(StringUtils.EMPTY, false);
110112
WiFiDetail wiFiDetail = withWiFiDetail(SSID, wiFiAdditional);
@@ -115,7 +117,7 @@ public void testMakeViewFullWithTabGone() {
115117
}
116118

117119
@Test
118-
public void testMakeViewFullWithGroupIndicatorGone() {
120+
public void testMakeViewCompleteWithGroupIndicatorGone() {
119121
// setup
120122
WiFiAdditional wiFiAdditional = new WiFiAdditional(StringUtils.EMPTY, false);
121123
WiFiDetail wiFiDetail = withWiFiDetail(SSID, wiFiAdditional);
@@ -126,7 +128,7 @@ public void testMakeViewFullWithGroupIndicatorGone() {
126128
}
127129

128130
@Test
129-
public void testMakeViewFullWithVendorShortNotVisible() {
131+
public void testMakeViewCompleteWithVendorShortNotVisible() {
130132
// setup
131133
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
132134
// execute
@@ -137,7 +139,7 @@ public void testMakeViewFullWithVendorShortNotVisible() {
137139
}
138140

139141
@Test
140-
public void testMakeViewFullWithVendorShortVisible() {
142+
public void testMakeViewCompleteWithVendorShortVisible() {
141143
// setup
142144
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(VENDOR_NAME, false));
143145
// execute
@@ -148,7 +150,7 @@ public void testMakeViewFullWithVendorShortVisible() {
148150
}
149151

150152
@Test
151-
public void testMakeViewFullWithVendorShortMaximumSize() {
153+
public void testMakeViewCompleteWithVendorShortMaximumSize() {
152154
// setup
153155
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(VENDOR_NAME, false));
154156
// execute
@@ -158,7 +160,7 @@ public void testMakeViewFullWithVendorShortMaximumSize() {
158160
}
159161

160162
@Test
161-
public void testMakeViewFullWithTabVisible() {
163+
public void testMakeViewCompleteWithTabVisible() {
162164
// setup
163165
WiFiDetail wiFiDetail = withWiFiDetail(StringUtils.EMPTY, new WiFiAdditional(StringUtils.EMPTY, false));
164166
// execute
@@ -168,7 +170,7 @@ public void testMakeViewFullWithTabVisible() {
168170
}
169171

170172
@Test
171-
public void testMakeViewFullWithWiFiDetailAndEmptySSID() {
173+
public void testMakeViewCompleteWithWiFiDetailAndEmptySSID() {
172174
// setup
173175
WiFiDetail wiFiDetail = withWiFiDetail(StringUtils.EMPTY, new WiFiAdditional(StringUtils.EMPTY, false));
174176
// execute
@@ -178,7 +180,7 @@ public void testMakeViewFullWithWiFiDetailAndEmptySSID() {
178180
}
179181

180182
@Test
181-
public void testMakeViewFullWithWiFiDetail() {
183+
public void testMakeViewCompleteWithWiFiDetail() {
182184
// setup
183185
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
184186
// execute
@@ -187,6 +189,16 @@ public void testMakeViewFullWithWiFiDetail() {
187189
validateTextViewValuesFullView(actual, wiFiDetail);
188190
}
189191

192+
@Test
193+
public void testMakeViewCompleteWithTextNotSelectable() {
194+
// setup
195+
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
196+
// execute
197+
View actual = fixture.makeView(null, null, wiFiDetail, false);
198+
// validate
199+
assertFalse(actual.<TextView>findViewById(R.id.ssid).isTextSelectable());
200+
}
201+
190202
@Test
191203
public void testMakeViewCompactWithTabGone() {
192204
// setup
@@ -269,6 +281,17 @@ public void testMakeViewCompactDoesNotHaveFullDetails() {
269281
assertNull(actual.findViewById(R.id.vendorShort));
270282
}
271283

284+
@Test
285+
public void testMakeViewCompactWithTextNotSelectable() {
286+
// setup
287+
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
288+
when(settings.getAccessPointView()).thenReturn(AccessPointViewType.COMPACT);
289+
// execute
290+
View actual = fixture.makeView(null, null, wiFiDetail, false);
291+
// validate
292+
assertFalse(actual.<TextView>findViewById(R.id.ssid).isTextSelectable());
293+
}
294+
272295
@Test
273296
public void testMakeViewPopupWithWiFiDetail() {
274297
// setup
@@ -280,7 +303,7 @@ public void testMakeViewPopupWithWiFiDetail() {
280303
}
281304

282305
@Test
283-
public void testMakeViewPopupWithVendorNotVisible() {
306+
public void testMakeViewDetailedWithVendorNotVisible() {
284307
// setup
285308
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
286309
// execute
@@ -291,7 +314,7 @@ public void testMakeViewPopupWithVendorNotVisible() {
291314
}
292315

293316
@Test
294-
public void testMakeViewPopupWithVendorVisible() {
317+
public void testMakeViewDetailedWithVendorVisible() {
295318
// setup
296319
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(VENDOR_NAME, false));
297320
// execute
@@ -301,6 +324,17 @@ public void testMakeViewPopupWithVendorVisible() {
301324
assertEquals(View.VISIBLE, actual.findViewById(R.id.vendorLong).getVisibility());
302325
}
303326

327+
@Test
328+
public void testMakeViewDetailedWithTextSelectable() {
329+
// setup
330+
WiFiDetail wiFiDetail = withWiFiDetail(SSID, new WiFiAdditional(StringUtils.EMPTY, false));
331+
// execute
332+
View actual = fixture.makeViewDetailed(wiFiDetail);
333+
// validate
334+
assertTrue(actual.<TextView>findViewById(R.id.ssid).isTextSelectable());
335+
assertTrue(actual.<TextView>findViewById(R.id.vendorLong).isTextSelectable());
336+
}
337+
304338
private WiFiDetail withWiFiDetail(String SSID, WiFiAdditional wiFiAdditional) {
305339
return new WiFiDetail(SSID, "BSSID", "capabilities", new WiFiSignal(1, 1, WiFiWidth.MHZ_40, 2), wiFiAdditional);
306340
}

0 commit comments

Comments
 (0)