Commit Graph

84 Commits

Author SHA1 Message Date
Brian Muramatsu
f074f02bc1 am 19b68add: am 8c329055: Merge "Fix Build" into froyo
* commit '19b68add2857e75ab9303c4e32f1abe987d7186d':
  Fix Build
2010-11-29 14:41:38 -08:00
Brian Muramatsu
8c32905516 Merge "Fix Build" into froyo 2010-11-29 14:31:18 -08:00
Brian Muramatsu
5822cf4427 Fix Build
Didn't have the right javac set in my environment... :-(

Change-Id: I951a11460eafeb75c081a4a07787aaf320b48b31
2010-11-29 14:28:39 -08:00
Brian Muramatsu
358cf19274 am 6873bf0f: am 91d0b1ea: Merge "Fix android.net.cts.ProxyTest" into froyo
* commit '6873bf0fd29a0537ba8e44459a0674fb77e9029d':
  Fix android.net.cts.ProxyTest
2010-11-29 14:06:01 -08:00
Brian Muramatsu
91d0b1ea9b Merge "Fix android.net.cts.ProxyTest" into froyo 2010-11-29 13:57:54 -08:00
Brian Muramatsu
c11e42329b am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo
* commit '69c69f156bebe834cfbb13eb7f93dc9e25ee723b':
  Stop WifiManagerTest from disabling current network.
2010-11-29 13:00:44 -08:00
Brian Muramatsu
5f78c57fc5 Fix android.net.cts.ProxyTest
Bug 3188260

Remove the code that was trying to write to secure settings
and take off the BrokenTest annotation.

Change-Id: I0759db38225a9822b25c987e66a7590c555b5e9e
2010-11-29 12:57:14 -08:00
Brett Chabot
9e410175ba Stop WifiManagerTest from disabling current network.
Bug 3181376

Change-Id: Ia8d12a10f4ed0c46325e76f1dffeef93412a55e5
2010-11-29 12:21:20 -08:00
Brett Chabot
bfc9868369 Stop WifiManagerTest from disabling current network.
Bug 3181376

Change-Id: I93fa28f20a36b2cc90fbe0a59bbfbac758855c3a
2010-11-12 17:24:30 -08:00
Brian Muramatsu
5ff0ab314c Delete CM#testAccessNetworkPreference Test
Bug 3106981

ConnectivityManager#setNetworkPreference used to be synchronous,
but now it merely sends a handler message. As a result, the
method won't throw any SecurityExceptions, because it will throw
it in the handler instead when trying to write to System.Secure
settings. The test tries to write invalid settings or the same
settings value to test that it won't throw a SecurityException.
Since the method won't throw the exceptions anymore and its
not clear how long to wait to confirm that the settings weren't
going to be changed, just delete these tests.

Change-Id: I9e754bb0e026656511512b17108c42c37d84b069
2010-10-20 15:04:28 -07:00
Brian Carlstrom
bf05633358 Create CTS test for SSL hostname checks
Bug: 2807618
Change-Id: I05b051d779850e51eabea0880400273cdcc2f748
2010-09-23 10:59:12 -07:00
DongseokYi
878dd15dce Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd.
Change-Id: I93fdd1bc383e8b944a76e211166e2c5fdb9707cd
2010-09-16 11:44:04 +09:00
Brian Muramatsu
fa2e66961f DO NOT MERGE Merge Eclair CTS Changes into Froyo
Changes to branches beyond Froyo will be done separately to avoid
further merge conflicts.

Change-Id: I157c687fa059f9505f5cf62b6d1348b0411bca1c
2010-07-07 11:53:35 -07:00
Brian Muramatsu
20a98ac150 Prohibit Listening Ports on Devices
Bug 2732034

Check that devices do not have any listening ports open by
scanning files in the /proc/net directory.

Change-Id: Ic6204667809b3a0c136e38f35fe536bc6d79dcad
2010-06-14 15:02:53 -07:00
Dan Egnor
4706a3af15 CTS test for android.net.TrafficStats
Change-Id: I35fecea2a343fe2483d8c723b7f3a2d9916d47f2
2010-04-08 14:02:54 -07:00
Brett Chabot
c4b56b887f Fix NetworkInfoTest#testAccessNetworkInfoProperties
Bug 2483701

Change-Id: I98c0fc74471d9a7a9511c224d5eaa52542a8d68f
2010-03-03 19:16:18 -08:00
Brian Carlstrom
cd7a8fa373 SslCertificate should provide Date interface
While working on out openssl code, I found a Y2k bug that the dates
from invalidate certificates could be shown as 1909 instead of 2009.
The reason was because SslCertificate/BrowserActivity passed the
values around as Strings even though the started as Dates (from
X509Certificate) and were converted backed to Dates before
presentation by BrowserActivity's reformatCertificateDate.

SslCertificate now maintains date fields internally as Date objects
without converting them to Strings. The constructor and String
accessors, which are now @deprecated, now specify the format as an ISO
8601 date string which uses 4 digit years.

BrowserActivity now reformatCertificateDate is now simply
formatCertificateDate and no longer has to convert from String to Date
and back to String to get proper Locale formatting.

CTS SslCertificateTest also updated.
2010-03-02 10:01:45 -08:00
The Android Open Source Project
c710405130 am a63efa5c: reconcile main tree with open-source eclair
Merge commit 'a63efa5cd15b125d7683cc5afb904e13503557a3' into eclair-plus-aosp

* commit 'a63efa5cd15b125d7683cc5afb904e13503557a3':
  android-2.1_r1 snapshot
2010-02-05 08:47:30 -08:00
The Android Open Source Project
1b6d5753bd reconcile android-2.1_r1 snapshot 2010-01-29 14:07:35 -08:00
The Android Open Source Project
69169b22ae merge from open-source master 2010-01-21 11:20:48 -08:00
The Android Open Source Project
8c81965feb android-2.1_r1 snapshot 2010-01-12 15:18:07 -08:00
The Android Open Source Project
16a5fa3ce2 empty initial commit 2010-01-11 14:33:36 -08:00
Brett Chabot
7aa0090ef5 Fix ConnectivityManagerTest testRequestRouteToHost and testGetAllNetworkInfo.
Bugs 2138046 and 2138034.

Change-Id: I2c3973be9166892caaf2deb07bc15344b897b552
2009-12-08 19:52:35 -08:00
Brett Chabot
1bf60c89bb Fix MailToTest.
Changed the toString assertions to be parameter order independent.
2009-11-03 15:57:26 -08:00
Brett Chabot
dcccc54888 Change CTS tests to not build against SDK.
Most CTS test packages reference test related annotations in dalvik.annotation
which are not part of SDK. This was previously allowed due to bug in build
build system. For now, temporarily change CTS makefiles so they are not built
against SDK.

BUG 2114936
2009-09-11 15:31:30 -07:00
Brett Chabot
7eb8c924df am 7578e575: Merge change 23155 into donut
Merge commit '7578e57567d63139b563e2a3c6face707beeb931' into eclair

* commit '7578e57567d63139b563e2a3c6face707beeb931':
  Change CTS makefiles so apps are built in data not system partition.
2009-08-28 14:24:10 -07:00
Brett Chabot
1505142f7b Change CTS makefiles so apps are built in data not system partition.
BUG 2053298

Change-Id: I2c541c03f7c33c69cde7b0567b080710658c8d28
2009-08-28 14:19:28 -07:00
Brett Chabot
e149cb4188 am f8ee8d58: Merge change 21233 into donut
Merge commit 'f8ee8d58f99f47611577eff98638b3f598655719' into eclair

* commit 'f8ee8d58f99f47611577eff98638b3f598655719':
  Remove a bunch of unused CTS tests from continuous test build to save space.
2009-08-18 11:01:25 -07:00
Brett Chabot
e84b4bd268 am bda6b585: More CTS cleanup
Merge commit 'bda6b58510265c32453985bc49624786fca56e64' into eclair

* commit 'bda6b58510265c32453985bc49624786fca56e64':
  More CTS cleanup
2009-08-18 10:39:20 -07:00
Brett Chabot
f4ffdb9732 Remove a bunch of unused CTS tests from continuous test build to save space.
BUG 2053298
2009-08-14 14:17:58 -07:00
Brett Chabot
bda6b58510 More CTS cleanup
- Mark currently failing CTS tests as BrokenTests.
 - Fix race condition in LocationManagerTest
 - tweak host config to run tests in batch mode
 - fix genDefaultTestPlan and rename java package so permission2 tests get
included properly,

BUG 2053939
2009-08-14 01:42:59 -07:00
Android (Google) Code Review
6674fe91c5 am 982d3cdd: Merge change 3974 into donut
Merge commit '982d3cdd4df777b104ae683f40e8b3b67c494157'

* commit '982d3cdd4df777b104ae683f40e8b3b67c494157':
  Integrate unsubmitted cupcake change 147342:
2009-06-14 21:12:23 -07:00
Phil Dubach
8b360f568a Integrate unsubmitted cupcake change 147342:
CTS: clean up code in android.net package
2009-06-11 15:50:32 -07:00
Android (Google) Code Review
05d30f1154 am 3e4391c5: Merge change 2506 into donut
Merge commit '3e4391c54f630139ba9da3618bd45c57b4bc1997'

* commit '3e4391c54f630139ba9da3618bd45c57b4bc1997':
  Integrate unsubmitted cupcake change 131139:
2009-06-03 13:00:26 -07:00
Android (Google) Code Review
3e4391c54f Merge change 2506 into donut
* changes:
  Integrate unsubmitted cupcake change 131139: 	CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager.     Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings.
2009-06-03 11:41:46 -07:00
Android (Google) Code Review
e6e7f38509 am 34416f75: Merge change 2963 into donut
Merge commit '34416f750fe2c47153bdfb8630762acecd21e524'

* commit '34416f750fe2c47153bdfb8630762acecd21e524':
  Integrate unsubmitted cupcake change 123653:
2009-06-02 15:37:20 -07:00
Phil Dubach
1c52e1c796 Integrate unsubmitted cupcake change 123653:
CTS: add test cases for net.SSLCertificateSocketFactory
2009-06-02 14:46:51 -07:00
Phil Dubach
a87bf95576 Integrate unsubmitted cupcake change 131139:
CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager.
    Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings.
2009-05-26 18:52:43 -07:00
Brett Chabot
bae7b44afb am e7a02b24: Revert "Change cts tests to use InstrumentationTestRunner."
Merge commit 'e7a02b243e27420df5273e0276442225dd50839e'

* commit 'e7a02b243e27420df5273e0276442225dd50839e':
  Revert "Change cts tests to use InstrumentationTestRunner."
2009-05-20 08:54:20 -07:00
Brett Chabot
e7a02b243e Revert "Change cts tests to use InstrumentationTestRunner."
This reverts commit 665f512ebc.
2009-05-19 18:08:05 -07:00
Android (Google) Code Review
2f0966479e am 22662ef2: Merge change 1706 into donut
Merge commit '22662ef236cc99f0c19f450d9209da961c4868da'

* commit '22662ef236cc99f0c19f450d9209da961c4868da':
  Change cts tests to use InstrumentationTestRunner.
2009-05-14 17:24:22 -07:00
Brett Chabot
665f512ebc Change cts tests to use InstrumentationTestRunner. 2009-05-14 15:55:21 -07:00
Phil Dubach
084f0ffb22 am aedc07c: am e480582: AI 148455: CTS: Change tests in Android plan to
Merge commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6'

* commit 'aedc07c0ed19dca06e48446921bdd231b7bc99f6':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
2009-05-07 10:37:59 -07:00
Phil Dubach
aedc07c0ed am e480582: AI 148455: CTS: Change tests in Android plan to use new Inst
Merge commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a' into donut

* commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
2009-05-07 10:34:59 -07:00
Phil Dubach
e480582d82 AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner
BUG=1537738

Automated import of CL 148455
2009-05-07 10:34:41 -07:00
Scott Su
05536f876d am 2f57a8b: am 68b8cda: AI 148053: CTS: fixed failed testcases
Merge commit '2f57a8b13618eb1cda6be49d16c90e0def12736b'

* commit '2f57a8b13618eb1cda6be49d16c90e0def12736b':
  AI 148053: CTS: fixed failed testcases
2009-04-30 17:23:06 -07:00
Scott Su
2f57a8b136 am 68b8cda: AI 148053: CTS: fixed failed testcases
Merge commit '68b8cda17af0cb88732ddbc264cfbeab86304d9b' into donut

* commit '68b8cda17af0cb88732ddbc264cfbeab86304d9b':
  AI 148053: CTS: fixed failed testcases
2009-04-30 17:09:23 -07:00
Scott Su
68b8cda17a AI 148053: CTS: fixed failed testcases
Automated import of CL 148053
2009-04-30 16:53:23 -07:00
Scott Su
0ce129ac17 am cd3f1ce: am 0f009ff: AI 147986: Change CTS tests to use Instrumentati
Merge commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d'

* commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d':
  AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
2009-04-30 00:01:22 -07:00
Scott Su
cd3f1cee8b am 0f009ff: AI 147986: Change CTS tests to use InstrumentationCoreTestRu
Merge commit '0f009ffc55bf3404f43dba000031d2293a14e061' into donut

* commit '0f009ffc55bf3404f43dba000031d2293a14e061':
  AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest
2009-04-29 23:30:41 -07:00