Commit Graph

211 Commits

Author SHA1 Message Date
The Android Automerger
97351eb43d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:52:26 -07:00
Jake Hamby
566cad494d Fix race condition causing occasional CTS failures.
WifiManagerTest was waiting for SUPPLICANT_STATE_CHANGED_ACTION
after enabling or disabling WiFi. Fix the code to check if the
WiFi state is already the desired state, and if not, to wait for
the WIFI_STATE_CHANGED_ACTION broadcast intent.

Bug: 7082455
Change-Id: Id1c2242c32311084f5587ea5403f6b227d1b8b04
2012-10-26 16:01:09 -07:00
The Android Automerger
c6fc53183e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 06:59:19 -07:00
Irfan Sheriff
a0a19ea8aa Make packet count test more robust
Ensure the packet count test does not fail due to a single attempt.
Our goal is to just ensure the packet count API exists.

Bug: 7001746
Change-Id: I8c6604528946166969126cd5b085024f81790a77
2012-10-17 16:12:19 -07:00
The Android Automerger
f9a11c0923 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 06:59:26 -07:00
Robert Greenwalt
3de9654925 Fix NetworkInfo CTS test.
bug:7074876
Change-Id: I29cf9086fda62dda8078b42a1632f139ec65ee52
2012-09-16 17:11:52 -07:00
The Android Automerger
da8aa37922 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-21 06:33:39 -07:00
Iliyan Malchev
87abf00d2f Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev 2012-08-20 14:58:31 -07:00
Iliyan Malchev
f1537c2ba4 Revert "Revert "CTS for timestamp in ScanResult""
With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 72010dbfcf

Change-Id: I1066567c728b233ad1d6c6af912c32ef099580e6
2012-08-20 13:21:49 -07:00
The Android Automerger
df68e37e22 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:33:20 -07:00
Yuhao Zheng
72465772e0 CTS test for WiFi watchdog.
The new WiFi watchdog requires kernel/driver to export some packet loss
counters. This CTS tests whether those counters are correctly exported.

Change-Id: Ic764eff64ff2ef354b46f17e46eb74b14f191e4c
2012-08-15 15:24:36 -07:00
The Android Automerger
2886080e64 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:33:33 -07:00
Iliyan Malchev
9420b3fe53 Revert "CTS for timestamp in ScanResult"
This accompanies:
https://googleplex-android-review.googlesource.com/217002

This reverts commit e9adc27111

Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 16:52:32 -07:00
Iliyan Malchev
72010dbfcf Revert "CTS for timestamp in ScanResult"
This accompanies:
https://googleplex-android-review.googlesource.com/217002

This reverts commit e9adc27111

Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 12:24:25 -07:00
Irfan Sheriff
e9adc27111 CTS for timestamp in ScanResult
Bug: 2961159
Change-Id: I8f1fd270a71173e2bd43b590914b7315232e4fba
2012-08-13 14:25:37 -07:00
Jean-Baptiste Queru
b59a2f446b am dc250c32: Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest"
* commit 'dc250c329f994891fe4334f16681ddc05c573acd':
  Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest
2012-08-08 12:00:06 -07:00
Jean-Baptiste Queru
dc250c329f Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest" 2012-08-08 11:21:36 -07:00
The Android Open Source Project
5d07675e26 Reconcile with jb-mr0-release jb-release
Change-Id: I897c49519ec349c3ac0fd8d1ca85f5cb7d8a27c9
2012-07-27 14:50:04 -07:00
Irfan Sheriff
f16bea1f59 Ignore case on network info name
Bug: 6309231
Change-Id: I41244e25ccbf0d896edebf886c7f67ab1ded0a04
2012-07-25 12:10:40 -07:00
The Android Automerger
dd6fb0a419 merge in jb-release history after reset to jb-dev 2012-07-24 20:23:08 -07:00
Irfan Sheriff
c0e2e5715b Fix NPE in CTS test
wifiConfigurations returned by getConfiguredNetworks() can be null.
It is only incidental that this test passed fine in the past.

Bug: 6822950
Change-Id: I570ab6e7fd6cc5eb150914a5d7ca527ccc2f16cd
2012-07-23 10:19:34 -07:00
Keun young Park
30199405c3 change testRunner to CtsTestRunner
- unlock keyguard by default

Change-Id: I0452a72cfa54edfa79b485894ffd0493a71122ee
2012-07-12 12:57:30 -07:00
Brian Muramatsu
a4170d951a Merge "Fix WifiInfoTest flakiness" into jb-dev 2012-06-27 12:56:05 -07:00
Irfan Sheriff
f7e73fcc35 Add wifi & p2p Concurrency test
Change-Id: I5a35fb097b22b00366b189bad9c44a640a7d5b5a
2012-06-26 16:54:35 -07:00
Brian Muramatsu
237e076594 Fix WifiInfoTest flakiness
Poll a bit longer waiting for getNetworkId and getWifiState to return
the proper values. The bug reports seem to indicate that the WiFi
is shutting down properly.

Add a new static check method to PollingCheck that I think is simpler
than the existing way of creating a new PollingCheck, overriding
check, and then making sure to call run. This new variation also allows
you to specify a message rather than just "unexpected timeout."

Bug 6443337

Change-Id: I9f7c942f6e26b957bb717b58b1ab984acc556bf7
2012-06-26 15:05:08 -07:00
bs
562af417ed Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest
Check if type of network is supported on the devices.
The device supporting TYPE_WIFI returns failureCode(-1).
But, not supported device returns wifiOnlyStartFailureCode or
wifiOnlyStopFailureCode.

Change-Id: I070bb19f6740367c476e78b884c2a36d111ff3ee
2012-06-26 20:23:47 +09:00
Brian Muramatsu
28ca76b84d Flip condition in ApacheHttpClientTest
Make sure to wait first and then check the expected state rather than
check the expected state first and then waiting.

Bug 6293413

Change-Id: Ibcb1127b935708c51fafdc8624cb3a7eefc01bda
2012-06-08 16:45:02 -07:00
Jesse Wilson
fb1b2d0923 Track rename of Uri.normalize() to Uri.normalizeScheme().
Change-Id: I0b6c65e033bfb82503f30e5c9e55903278c4a788
2012-05-10 14:32:37 -04:00
Brian Muramatsu
7dde0466ab Fix NetworkInfo_DetailedStateTest
Bug 6292661

Test is missing a new enum value.

Change-Id: I0f5983575eb7aeb87b212e44c5476025a4baf609
2012-04-04 18:22:15 -07:00
Chia-chi Yeh
6bda9056ef Add CTS test for android.net.rtp.
Bug: 5975113
Change-Id: I20ec3b172a2d6501048418f4c3da06d1b7144fd3
2012-03-30 14:20:25 -07:00
Brian Muramatsu
248128f2a9 Static Libs for Popular CTS Stub Components
com.android.cts.stub is growing very large. Split apart some of
the popular components into separate static libraries. This
should allow packages to depend on the components they need
rather than all of cts.stub.

Current code at the moment doesn't have to be changed, because
I have CtsTestStubs depending on these new shared libraries.
However, change the net package to depend on the ctstestserver
static library as a proof of concept rather than including
its source directly.

Change-Id: I32c54eab3ddfb1d4391d6ffc347fbc9cb2fe97f9
2012-03-05 18:46:33 -08:00
Chia-chi Yeh
5db6b9ccd9 am 2b080081: am 0ba8011d: am 66efc9c3: Add CTS test for android.net.VpnService.
* commit '2b080081211979d0b631d998b3a112359c5b7ed1':
  Add CTS test for android.net.VpnService.
2012-02-28 17:56:25 -08:00
Chia-chi Yeh
66efc9c3c0 Add CTS test for android.net.VpnService.
Bug: 5910784
Change-Id: Icb3d874d4d0917f739bd2638596f28df2a7d206e
2012-02-28 17:45:26 -08:00
Chia-chi Yeh
e4791afe6c am b57076f9: am edd2f178: am 4231515a: Free net.cts from cts.stub.
* commit 'b57076f9137e2acd6fb9145b8f8be26f43d91cdb':
  Free net.cts from cts.stub.
2012-02-28 15:40:30 -08:00
Chia-chi Yeh
4231515a1b Free net.cts from cts.stub.
Explicitly include CtsTestServer in Android.mk to eliminate the
dependency to cts.stub. This allows net.cts to instrument itself,
and it also allows network-specific JNI code to be added in the
same package.

Change-Id: I624f87e0112619c5b97f2c3589933f666665fa8e
2012-02-28 14:58:23 -08:00
Keun young Park
874d50fc8a am 5ca3810a: am 86c57f70: am 3e1d8ebc: Merge "skip WiFi test if not supproted - Support info is coming from PackageManager Bug: 5547397" into ics-mr1
* commit '5ca3810a38a9daa55b3d150679b089721af80b60':
  skip WiFi test if not supproted - Support info is coming from PackageManager Bug: 5547397
2012-02-14 12:44:04 -08:00
Keun young Park
a36a66a542 skip WiFi test if not supproted
- Support info is coming from PackageManager
Bug: 5547397

Change-Id: I35d0ac82fe31a436d38d0436d32c0bb194eba3a6
2012-02-14 09:27:14 -08:00
Brian Muramatsu
08acbf9245 Remove Test Annotations
These annotations are not being parsed by any program.
Also they are distracting to readers and are painful to
maintain. Furthermore, they prevent us from adding the
LOCAL_SDK_CURRENT clause to Makefiles which is useful
to detect and stop us from using private APIs.

Change-Id: Id93b3a80c73df808c342e489f1434261f288204c
2012-01-26 16:44:21 -08:00
Nick Pelly
beb5a527e3 CTS tests for Intent.normalize...() API's
Change-Id: I5b21028dd29f5bd1565c2ca2f65636ca9aa901d0
2012-01-24 20:04:55 -08:00
Brian Muramatsu
59be169eb9 Move Test XML Generation from buildCts.py
buildCts.py was the central script that generated all the
test package XMLs each time CTS was built. This had a
couple problems:

1. All the XML files for ~40 packages needed to be made
   every time CTS was made. Even if those packages were
   not touched at all.

2. Couldn't shard the XML generation process across the
   available cores on a machine. A pool was added to the
   python script, but it was set to a fixed number.

This change moves the test XML generation into a
smaller Java program called "cts-java-scanner" and
the doclet it relies upon to scan the Java files
into "cts-java-scanner-doclet.jar". The output of
the scanner like "cts-native-scanner" for native EXEs
is piped to the existing cts-xml-generator to
produce the test XMLs.

New CTS specific rules replace the standard
BUILD_PACKAGE and BUILD_HOST_JAVA_LIBRARY. They just
add extra rules for the package XML. The BUILD_CTS_PACKAGE
rule also adds a rule for copying the "package.apk"
to something more like "CtsFooTestCases.apk" to the
test case out directory. All the apks, exes, and xmls
are now thrown into a "cts-testcases" directory, before
they are copied to the final CTS distribution.

This change should prevent rebuilding the XMLs
unnecessarily and make rebuilding CTS quicker while
writing tests.

There are still the libcore tests that are always rebuilt,
but they can be adapted to fit into this model someday...

Change-Id: I52a916aa37fd679057e2709bb0ccec694c9fca01
2012-01-05 11:43:00 -08:00
Brian Muramatsu
46c9ffe1ea am dc37b725: (-s ours) am 395cb95d: resolved conflicts for merge of 309f8b3f to ics-mr1
* commit 'dc37b7251c8edd3e73797c4d0e3acb6df192fb59':
  DO NOT MERGE Update CTS Version to 2.3_r10
  Add SKT/KT rule into CtsTelephonyTestCases and use MCC+MNC code to distinguish SKT or KT carriers.
  Fix AudioRecordTest to skip setUp() and tearDown() when MIC is not available.
  fix IPv6 loopback pattern
  Update the list UNSUPPORT_DATA_SMS_MESSAGES
  Adjust the value of individualStartTimeoutMs to be consistent with the value of testStatusTimeoutMs.
  Revert "Changed CTS runner to work with emulator"
  Disable CTS Verifier BT Connection Access Tests
  Fix Test Blacklist Mistake for HC MR2
  Update CTS Verifier Version to 3.1 R2
  Update CTS Version to 3.1 R5
2011-11-18 15:22:39 -08:00
Brian Muramatsu
395cb95d6f resolved conflicts for merge of 309f8b3f to ics-mr1
Change-Id: I12a9563ab4e3d2119f7fd6ca8a2921c7baab8d4c
2011-11-18 11:30:54 -08:00
Brian Muramatsu
309f8b3fb5 Merge remote branch 'goog/honeycomb-mr2' into ics-mr0
Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/expectations/knownfailures.txt

Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f
2011-11-17 17:21:23 -08:00
Brian Muramatsu
f021575916 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 2011-11-17 16:51:08 -08:00
Brian Muramatsu
5e1dd100c8 Merge remote branch 'goog/honeycomb' into honeycomb-mr1 2011-11-17 15:09:45 -08:00
Brian Muramatsu
4141ef9430 Merge remote branch 'goog/gingerbread' into honeycomb
Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: Ie15a3eb7f002a300469f17e3f906856c07061223
2011-11-17 14:20:50 -08:00
Nick Kralevich
fff8fb1b9f Move file, change loopback handling, docs.
Move the ListeningPortsTest from android.net.cts to android.security.cts,
to better indicate that this is a security related test.

Start triggering test failures when a process is bound to the loopback
interface. In those cases, it's always better to use a UNIX domain
socket instead of a locally bound IP socket. UNIX domain sockets
can be protected with unix filesystem permissions, or
getsockopt(SO_PEERCRED) can be used to indicate who is on the
other end of the socket.

Drastically fix the documentation to explain why this test is present.

Modify the IP addresses and port numbers to be more human readable.

Change-Id: Id83aadd1455279a1a2d3fb4fb1915af558355aca
2011-11-02 14:42:03 -07:00
Brett Chabot
c4f14d8f8f am cb8b1d95: Merge "Only install necessary prequisite apks." into ics-mr0
* commit 'cb8b1d9566e122812b7da9346254bb97eb06bc40':
  Only install necessary prequisite apks.
  Execute remaining tests in order.
  fix IPv6 loopback pattern
  DO NOT MERGE Adjust test start date
  Retain META-INF in core-tests.
  Fix a mismatch problem because of hidden public API in CamcorderProfile.java
  Update CTS Verifier Feature Summary
2011-10-26 12:22:36 +00:00
Nick Kralevich
52cc91ff45 fix IPv6 loopback pattern
In /proc/net/udp6 and /proc/net/tcp6, the addresses stored
in that file are in network byte order.  As a result, the IPv6
loopback address, ::1, is stored as
00000000000000000000000001000000 NOT
00000000000000000000000000000001

Bug: 5473686
Change-Id: I73098d52c981c48d82423c8ce99b6b20d11a5568
2011-10-25 20:35:52 +00:00
Nick Kralevich
3dc050e0eb fix IPv6 loopback pattern
In /proc/net/udp6 and /proc/net/tcp6, the addresses stored
in that file are in network byte order.  As a result, the IPv6
loopback address, ::1, is stored as
00000000000000000000000001000000 NOT
00000000000000000000000000000001

Bug: 5473686
Change-Id: I73098d52c981c48d82423c8ce99b6b20d11a5568
2011-10-25 11:27:24 -07:00