Skip to content

Commit 3f794a0

Browse files
diemoldiemol
committed
[java] Removing more usages of deprecated "platform" capability.
1 parent c8da7c2 commit 3f794a0

File tree

3 files changed

+35
-38
lines changed

3 files changed

+35
-38
lines changed

‎java/src/org/openqa/selenium/SharedCapabilitiesMethods.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static void setCapability(Map<String, Object> caps, String key, Object value) {
5757
return;
5858
}
5959

60-
if ("platform".equals(key) && value instanceof String) {
60+
if ("platformName".equals(key) && value instanceof String) {
6161
try {
6262
caps.put(key, Platform.fromString((String) value));
6363
} catch (WebDriverException e) {

‎java/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,34 +51,34 @@ public void testAddingTheSameCapabilityToAMapTwiceShouldResultInOneEntry() {
5151
@Test
5252
public void testAugmentingCapabilitiesReturnsNewCapabilities() {
5353
DesiredCapabilities origCapabilities = new DesiredCapabilities();
54-
origCapabilities.setCapability("Browser", "firefox");
54+
origCapabilities.setCapability("BrowserName", "firefox");
5555

5656
DesiredCapabilities extraCapabilities = new DesiredCapabilities();
57-
extraCapabilities.setCapability("Platform", "any");
57+
extraCapabilities.setCapability("PlatformName", "any");
5858

5959
origCapabilities.merge(extraCapabilities);
60-
assertThat(origCapabilities.getCapability("Browser")).isEqualTo("firefox");
61-
assertThat(origCapabilities.getCapability("Platform")).isEqualTo("any");
60+
assertThat(origCapabilities.getCapability("BrowserName")).isEqualTo("firefox");
61+
assertThat(origCapabilities.getCapability("PlatformName")).isEqualTo("any");
6262
}
6363

6464
@Test
6565
public void testCopyConstructorWithNullArgument() {
6666
DesiredCapabilities origCapabilities = new DesiredCapabilities((Capabilities) null);
6767

68-
origCapabilities.setCapability("Browser", "firefox");
69-
assertThat(origCapabilities.getCapability("Browser")).isEqualTo("firefox");
68+
origCapabilities.setCapability("BrowserName", "firefox");
69+
assertThat(origCapabilities.getCapability("BrowserName")).isEqualTo("firefox");
7070
}
7171

7272
@Test
7373
public void testCopyConstructorDoesNotAliasToArgument() {
7474
DesiredCapabilities origCapabilities = new DesiredCapabilities();
75-
origCapabilities.setCapability("Browser", "firefox");
75+
origCapabilities.setCapability("BrowserName", "firefox");
7676

7777
DesiredCapabilities newCapabilities = new DesiredCapabilities(origCapabilities);
78-
origCapabilities.setCapability("Browser", "ie");
78+
origCapabilities.setCapability("BrowserName", "ie");
7979

80-
assertThat(origCapabilities.getCapability("Browser")).isEqualTo("ie");
81-
assertThat(newCapabilities.getCapability("Browser")).isEqualTo("firefox");
80+
assertThat(origCapabilities.getCapability("BrowserName")).isEqualTo("ie");
81+
assertThat(newCapabilities.getCapability("BrowserName")).isEqualTo("firefox");
8282
}
8383

8484
@Test
@@ -95,25 +95,25 @@ public void testExtractDebugLogLevelFromCapabilityMap() {
9595
@Test
9696
public void shouldAutomaticallyConvertPlatformFromStringToEnum() {
9797
DesiredCapabilities caps = new DesiredCapabilities();
98-
caps.setCapability(CapabilityType.PLATFORM, "windows 7");
99-
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.VISTA);
100-
caps.setCapability(CapabilityType.PLATFORM, "win8.1");
101-
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.WIN8_1);
98+
caps.setCapability(CapabilityType.PLATFORM_NAME, "windows 7");
99+
assertThat(caps.getCapability(CapabilityType.PLATFORM_NAME)).isEqualTo(Platform.VISTA);
100+
caps.setCapability(CapabilityType.PLATFORM_NAME, "win8.1");
101+
assertThat(caps.getCapability(CapabilityType.PLATFORM_NAME)).isEqualTo(Platform.WIN8_1);
102102
}
103103

104104
@Test
105105
public void shouldNotAutomaticallyConvertPlatformIfItNotConvertible() {
106106
DesiredCapabilities caps = new DesiredCapabilities();
107-
caps.setCapability(CapabilityType.PLATFORM, "FreeBSD");
108-
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo("FreeBSD");
107+
caps.setCapability(CapabilityType.PLATFORM_NAME, "FreeBSD");
108+
assertThat(caps.getCapability(CapabilityType.PLATFORM_NAME)).isEqualTo("FreeBSD");
109109
}
110110

111111
@Test
112112
public void shouldNotAutomaticallyConvertPlatformIfItNotConvertibleInConstructor() {
113-
Map<String, Object> capabilitiesMap = ImmutableMap.of(CapabilityType.PLATFORM, "FreeBSD");
113+
Map<String, Object> capabilitiesMap = ImmutableMap.of(CapabilityType.PLATFORM_NAME, "FreeBSD");
114114

115115
DesiredCapabilities caps = new DesiredCapabilities(capabilitiesMap);
116-
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo("FreeBSD");
116+
assertThat(caps.getCapability(CapabilityType.PLATFORM_NAME)).isEqualTo("FreeBSD");
117117
}
118118

119119
@Test

‎java/test/org/openqa/selenium/remote/NewSessionPayloadTest.java

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@
1717

1818
package org.openqa.selenium.remote;
1919

20-
import static java.util.Arrays.asList;
21-
import static java.util.Collections.EMPTY_MAP;
22-
import static java.util.Collections.emptyMap;
23-
import static java.util.Collections.singleton;
24-
import static java.util.Collections.singletonList;
25-
import static java.util.Collections.singletonMap;
26-
import static java.util.stream.Collectors.toList;
27-
import static org.assertj.core.api.Assertions.assertThat;
28-
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
29-
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.assertNull;
31-
import static org.openqa.selenium.json.Json.MAP_TYPE;
32-
3320
import com.google.common.collect.ImmutableMap;
3421

3522
import org.junit.Test;
@@ -46,6 +33,19 @@
4633
import java.util.List;
4734
import java.util.Map;
4835

36+
import static java.util.Arrays.asList;
37+
import static java.util.Collections.EMPTY_MAP;
38+
import static java.util.Collections.emptyMap;
39+
import static java.util.Collections.singleton;
40+
import static java.util.Collections.singletonList;
41+
import static java.util.Collections.singletonMap;
42+
import static java.util.stream.Collectors.toList;
43+
import static org.assertj.core.api.Assertions.assertThat;
44+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
45+
import static org.junit.Assert.assertEquals;
46+
import static org.junit.Assert.assertNull;
47+
import static org.openqa.selenium.json.Json.MAP_TYPE;
48+
4949
@Category(UnitTests.class)
5050
public class NewSessionPayloadTest {
5151

@@ -165,12 +165,11 @@ public void shouldMergeAlwaysAndFirstMatches() {
165165
@Test
166166
public void shouldCorrectlyExtractPlatformNameFromOssCapabilities() {
167167
List<Capabilities> capabilities = create(singletonMap(
168-
"desiredCapabilities", singletonMap(
169-
"platform", "linux")));
168+
"desiredCapabilities", singletonMap(
169+
"platformName", "linux")));
170170

171171
assertEquals(Platform.LINUX, capabilities.get(0).getPlatformName());
172-
assertEquals(Platform.LINUX, capabilities.get(0).getCapability("platform"));
173-
assertNull(capabilities.get(0).getCapability("platformName"));
172+
assertEquals(Platform.LINUX, capabilities.get(0).getCapability("platformName"));
174173
}
175174

176175
@Test
@@ -181,8 +180,6 @@ public void shouldCorrectlyExtractPlatformFromW3cCapabilities() {
181180
"platformName", "linux"))));
182181

183182
assertEquals(Platform.LINUX, capabilities.get(0).getPlatformName());
184-
assertNull(capabilities.get(0).getCapability("platform"));
185-
assertEquals("linux", capabilities.get(0).getCapability("platformName"));
186183
}
187184

188185
@Test

0 commit comments

Comments
 (0)