Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Inflate menu before calling method injection #1962

Merged
WonderCsabo merged 2 commits into from
Mar 18, 2017
Merged

Inflate menu before calling method injection #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ed42f
Inflate menu before calling method injection
dodgex Mar 5, 2017
0da3d1b
Extend InjectMenu tests to ensure that MenuInflater has been called
dodgex Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ...idannotations-test/src/main/java/org/androidannotations/test/menu/InjectMenuActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@

import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.InjectMenu;
import org.androidannotations.annotations.OptionsMenu;
import org.androidannotations.test.R;

import android.app.Activity;
import android.content.Context;
import android.view.Menu;
import android.view.MenuInflater;

@EActivity
@OptionsMenu(R.menu.my_menu)
public class InjectMenuActivity extends Activity {

@InjectMenu
Expand All @@ -30,13 +35,31 @@ public class InjectMenuActivity extends Activity {
Menu methodInjectedMenu;
Menu multiInjectedMenu;

boolean menuIsInflated;

@InjectMenu
void methodInjectedExtra(Menu methodInjectedMenu) {
this.menuIsInflated = mockMenuInflater.menuInflated;
this.methodInjectedMenu = methodInjectedMenu;
}

void multiInjectedMenu(@InjectMenu Menu multiInjectedMenu, @InjectMenu Menu multiInjectedMenu2) {
this.menuIsInflated = mockMenuInflater.menuInflated;
this.multiInjectedMenu = multiInjectedMenu;
}

MockMenuInflater mockMenuInflater;

@Override
public MenuInflater getMenuInflater() {
return mockMenuInflater;
}

class MockMenuInflater extends MenuInflater {
boolean menuInflated = false;

MockMenuInflater(Context context) {
super(context);
}
}
}
26 changes: 26 additions & 0 deletions ...notations-test/src/test/java/org/androidannotations/test/menu/InjectMenuActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@
package org.androidannotations.test.menu;

import static org.fest.assertions.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;

Expand All @@ -34,6 +39,7 @@ public class InjectMenuActivityTest {
@Before
public void setUp() {
injectMenuActivity = Robolectric.buildActivity(InjectMenuActivity_.class).create().get();
injectMenuActivity.mockMenuInflater = createMenuInflater();
}

@Test
Expand All @@ -48,6 +54,14 @@ public void testMenuInjectedFromOnCreateOptionsMenu() {
assertThat(injectMenuActivity.menu).isSameAs(menu);
}

@Test
public void methodInjectionComesAfterInflation() {
Menu menu = mock(Menu.class);
assertThat(injectMenuActivity.menuIsInflated).isFalse();
injectMenuActivity.onCreateOptionsMenu(menu);
assertThat(injectMenuActivity.menuIsInflated).isTrue();
}

@Test
public void methodInjectedMenu() {
Menu menu = mock(Menu.class);
Expand All @@ -61,4 +75,16 @@ public void multiInjectedMenu() {
injectMenuActivity.onCreateOptionsMenu(menu);
assertThat(injectMenuActivity.multiInjectedMenu).isSameAs(menu);
}

private InjectMenuActivity.MockMenuInflater createMenuInflater() {
final InjectMenuActivity.MockMenuInflater menuInflater = mock(InjectMenuActivity.MockMenuInflater.class);
doAnswer(new Answer<Void>() {
public Void answer(InvocationOnMock invocation) {
menuInflater.menuInflated = true;
return null;
}
}).when(menuInflater).inflate(anyInt(), any(Menu.class));
return menuInflater;
}

}
10 changes: 10 additions & 0 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public class EActivityHolder extends EComponentWithViewSupportHolder implements
private JBlock injectExtrasBlock;
private JVar injectExtras;
private JBlock onCreateOptionsMenuMethodBody;
private JBlock onCreateOptionsMenuMethodInflateBody;
private JVar onCreateOptionsMenuMenuInflaterVar;
private JVar onCreateOptionsMenuMenuParam;
private JVar onOptionsItemSelectedItem;
Expand Down Expand Up @@ -306,6 +307,7 @@ private void setOnCreateOptionsMenu() {
JBlock methodBody = method.body();
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
onCreateOptionsMenuMenuInflaterVar = methodBody.decl(getClasses().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
onCreateOptionsMenuMethodInflateBody = methodBody.blockSimple();
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
methodBody._return(_super().invoke(method).arg(onCreateOptionsMenuMenuParam));
}
Expand Down Expand Up @@ -487,6 +489,14 @@ public JBlock getOnCreateOptionsMenuMethodBody() {
return onCreateOptionsMenuMethodBody;
}

@Override
public JBlock getOnCreateOptionsMenuMethodInflateBody() {
if (onCreateOptionsMenuMethodInflateBody == null) {
setOnCreateOptionsMenu();
}
return onCreateOptionsMenuMethodInflateBody;
}

@Override
public JVar getOnCreateOptionsMenuMenuInflaterVar() {
if (onCreateOptionsMenuMenuInflaterVar == null) {
Expand Down
10 changes: 10 additions & 0 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class EFragmentHolder extends EComponentWithViewSupportHolder implements
private ReceiverRegistrationDelegate<EFragmentHolder> receiverRegistrationDelegate;
private PreferencesDelegate preferencesDelegate;
private JBlock onCreateOptionsMenuMethodBody;
private JBlock onCreateOptionsMenuMethodInflateBody;
private JVar onCreateOptionsMenuMenuInflaterVar;
private JVar onCreateOptionsMenuMenuParam;
private JVar onOptionsItemSelectedItem;
Expand Down Expand Up @@ -169,6 +170,7 @@ private void setOnCreateOptionsMenu() {
JBlock methodBody = method.body();
onCreateOptionsMenuMenuParam = method.param(getClasses().MENU, "menu");
onCreateOptionsMenuMenuInflaterVar = method.param(getClasses().MENU_INFLATER, "inflater");
onCreateOptionsMenuMethodInflateBody = methodBody.blockSimple();
onCreateOptionsMenuMethodBody = methodBody.blockSimple();
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);

Expand Down Expand Up @@ -419,6 +421,14 @@ public JBlock getOnCreateOptionsMenuMethodBody() {
return onCreateOptionsMenuMethodBody;
}

@Override
public JBlock getOnCreateOptionsMenuMethodInflateBody() {
if (onCreateOptionsMenuMethodInflateBody == null) {
setOnCreateOptionsMenu();
}
return onCreateOptionsMenuMethodInflateBody;
}

@Override
public JVar getOnCreateOptionsMenuMenuInflaterVar() {
if (onCreateOptionsMenuMenuInflaterVar == null) {
Expand Down
3 changes: 3 additions & 0 deletions ...s-core/androidannotations/src/main/java/org/androidannotations/holder/HasOptionsMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
* Copyright (C) 2016-2017 the AndroidAnnotations project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -21,6 +22,8 @@
public interface HasOptionsMenu extends GeneratedClassHolder {
JBlock getOnCreateOptionsMenuMethodBody();

JBlock getOnCreateOptionsMenuMethodInflateBody();

JVar getOnCreateOptionsMenuMenuInflaterVar();

JVar getOnCreateOptionsMenuMenuParam();
Expand Down
3 changes: 2 additions & 1 deletion ...ations/src/main/java/org/androidannotations/internal/core/handler/OptionsMenuHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
* Copyright (C) 2016-2017 the AndroidAnnotations project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand Down Expand Up @@ -46,7 +47,7 @@ public void validate(Element element, ElementValidation validation) {

@Override
public void process(Element element, HasOptionsMenu holder) {
JBlock body = holder.getOnCreateOptionsMenuMethodBody();
JBlock body = holder.getOnCreateOptionsMenuMethodInflateBody();
JVar menuInflater = holder.getOnCreateOptionsMenuMenuInflaterVar();
JVar menuParam = holder.getOnCreateOptionsMenuMenuParam();

Expand Down