| 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/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
|
| f75c664e29df07519188f940ead0cae5865149e5 |
|
16-Jul-2011 |
Chris Van Vranken <cessationoftime@gmail.com> |
edit TabSpecTest.shouldGetAndSetTheIndicatorLabelAndIcon
On branch ShadowTabActivityFix
modified: src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
|
| abdce5dbe0e841abf0ea5d57aea5c496fdd039e4 |
|
16-Jul-2011 |
Chris Van Vranken <cessationoftime@gmail.com> |
created new tests:
TabActivityTest.tabActivityShouldNotMakeNewTabHostEveryGet
TabSpecTest.shouldGetAndSetTheIndicatorLabel
TabSpecTest.shouldGetAndSetTheIndicatorLabelAndIcon
On branch ShadowTabActivityFix
new file: src/test/java/com/xtremelabs/robolectric/shadows/TabActivityTest.java
modified: src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
|
| 7720cdebf0a7c543dd00569149a357e1501b2063 |
|
24-Jun-2011 |
Tyler Schultz <pair+tyler@pivotallabs.com> |
ShadowTabSpec responds to setContent(Intent)
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
|
| b8898598e493d4df40038a501ff77f2aa437e9ef |
|
23-Jun-2011 |
Mike Grafton & Tyler Schultz <pair+mike+tyler@pivotallabs.com> |
Shadows for TabHost and TabSpec
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/TabSpecTest.java
|