| 5117035453920f3d4d0f3969bdab0305dcdb94ba |
|
29-Jul-2011 |
Joe Moore & Ryan Richard <pair+joe+rrichard@pivotallabs.com> |
Merge remote branch 'upstream/master'
Conflicts:
src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
|
| 89e9d844e025ab9de8ec19eaf4cb4c6022012254 |
|
17-Jul-2011 |
Chris Van Vranken <cessationoftime@gmail.com> |
implemented TabSpec.setContent(TabContentFactory factory)
implemented TabHost.getCurrentView()
added shadow methods on ShadowTabSpec:
getContentViewId()
getContentView()
added Tests:
TabHostTest.shouldRetrieveTheCurrentViewFromTabContentFactory
TabHostTest.shouldRetrieveTheCurrentViewFromViewId
TabSpecTest.shouldSetTheContentView
TabSpecTest.shouldSetTheContentViewId
On branch TabContentFactory
modified: src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java
modified: src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
modified: src/test/java/com/xtremelabs/robolectric/shadows/TabHostTest.java
modified: src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|
| e2f20558e0dc038ee93e3aa4f439c69c6e97c050 |
|
04-Jul-2011 |
Chris Van Vranken <cessationoftime@gmail.com> |
Fixed GetTabHost() in TabActivity so it doesn't return a new TabHost on every call.
Implemented getIndicatorLabel and getIndicatorIcon in ShadowTabSpec for assertions.
modified: src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabActivity.java
modified: src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|
| 0db555ccfd46ab2157b6f9b3ebb52936ebb3e5f2 |
|
02-Jul-2011 |
Chris Van Vranken <cessationoftime@gmail.com> |
Add implementations to ShadowTabSpec for setContent(int) and setIndicator(CharSequence)
modified: src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|
| 5f52066979dd3a3eb6a0df2cd360611c50fb31ec |
|
01-Jul-2011 |
Ryan Richard <pair+rrichard@pivotallabs.com> |
Merge remote branch 'upstream/master'
Conflicts:
.pairs
src/main/java/com/xtremelabs/robolectric/Robolectric.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java
src/test/java/com/xtremelabs/robolectric/RobolectricTest.java
src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
|
| 7720cdebf0a7c543dd00569149a357e1501b2063 |
|
24-Jun-2011 |
Tyler Schultz <pair+tyler@pivotallabs.com> |
ShadowTabSpec responds to setContent(Intent)
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|
| b8898598e493d4df40038a501ff77f2aa437e9ef |
|
23-Jun-2011 |
Mike Grafton & Tyler Schultz <pair+mike+tyler@pivotallabs.com> |
Shadows for TabHost and TabSpec
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|
| 203e06c477634129655bee1db352d7e574513f9c |
|
21-May-2011 |
Joe Moore, Lowell Kirsh & Ryan Richard <pair+joe+lowell+rrichard@pivotallabs.com> |
Added just enough support for tab so that we don't crash
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java
|