commit 569fdfd84583ec7868ca3105b4d2bfd79e10fffe
author Sudheer Shanka <sudheersai@google.com> Tue May 02 05:12:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 05:12:53 2017 +0000
tree 5b815a9b4c3509e39dde6c27bfbc61b3422e3331
parent 7359ffec6e9c68330270567f9823ef45d8540131
parent 7655b694ec15e4e31b473a96fc3d4507cdb53456

Merge "Fix CtsHostsideNetworkTests." into oc-dev

tests/cts/net/src/android/net/wifi/cts/PpsMoParserTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/PpsMoParserTest.java b/tests/cts/net/src/android/net/wifi/cts/PpsMoParserTest.java
index b5e2f77..0304fda 100644
--- a/tests/cts/net/src/android/net/wifi/cts/PpsMoParserTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/PpsMoParserTest.java
@@ -107,19 +107,19 @@
         assertEquals(subscriptionUpdate, config.getSubscriptionUpdate());
 
         // Subscription parameters.
-        config.setSubscriptionCreationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
+        config.setSubscriptionCreationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime());
         assertEquals(format.parse("2016-02-01T10:00:00Z").getTime(),
-                config.getSubscriptionCreationTimeInMs());
-        config.setSubscriptionExpirationTimeInMs(format.parse("2016-03-01T10:00:00Z").getTime());
+                config.getSubscriptionCreationTimeInMillis());
+        config.setSubscriptionExpirationTimeInMillis(format.parse("2016-03-01T10:00:00Z").getTime());
         assertEquals(format.parse("2016-03-01T10:00:00Z").getTime(),
-                config.getSubscriptionExpirationTimeInMs());
+                config.getSubscriptionExpirationTimeInMillis());
         config.setSubscriptionType("Gold");
         assertEquals("Gold", config.getSubscriptionType());
         config.setUsageLimitDataLimit(921890);
         assertEquals(921890, config.getUsageLimitDataLimit());
-        config.setUsageLimitStartTimeInMs(format.parse("2016-12-01T10:00:00Z").getTime());
+        config.setUsageLimitStartTimeInMillis(format.parse("2016-12-01T10:00:00Z").getTime());
         assertEquals(format.parse("2016-12-01T10:00:00Z").getTime(),
-                config.getUsageLimitStartTimeInMs());
+                config.getUsageLimitStartTimeInMillis());
         config.setUsageLimitTimeLimitInMinutes(120);
         assertEquals(120, config.getUsageLimitTimeLimitInMinutes());
         config.setUsageLimitUsageTimePeriodInMinutes(99910);
@@ -153,12 +153,12 @@
 
         // Credential configuration.
         Credential credential = new Credential();
-        credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime());
+        credential.setCreationTimeInMillis(format.parse("2016-01-01T10:00:00Z").getTime());
         assertEquals(format.parse("2016-01-01T10:00:00Z").getTime(),
-                credential.getCreationTimeInMs());
-        credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
+                credential.getCreationTimeInMillis());
+        credential.setExpirationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime());
         assertEquals(format.parse("2016-02-01T10:00:00Z").getTime(),
-                credential.getExpirationTimeInMs());
+                credential.getExpirationTimeInMillis());
         credential.setRealm("shaken.stirred.com");
         assertEquals("shaken.stirred.com", credential.getRealm());
         credential.setCheckAaaServerCertStatus(true);