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

Use correct block for method injection of ViewById and ViewsById #1967

Merged
dodgex merged 2 commits into from
Mar 14, 2017
Merged

Use correct block for method injection of ViewById and ViewsById #1967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98354b4
Create a seperate block for view holder lookups
dodgex Mar 14, 2017
d41e22d
Add test case to ensure method injection is called after lookup
dodgex Mar 14, 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
Prev Previous commit
Add test case to ensure method injection is called after lookup
  • Loading branch information
@dodgex
dodgex committed Mar 14, 2017
commit d41e22df424f91d6281b9db2a7ffc4bef87bb03a
35 changes: 35 additions & 0 deletions ...notations-test/src/main/java/org/androidannotations/test/ViewsInjectionOrderActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
* 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
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.test;

import java.util.List;

import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewsById;

import android.app.Activity;
import android.widget.TextView;

@EActivity(R.layout.views_injected)
public class ViewsInjectionOrderActivity extends Activity {

List<TextView> methodInjectedViews;

@ViewsById({ R.id.my_text_view, R.id.someView })
void methodInjectedViews(List<TextView> someView) {
methodInjectedViews = someView;
}
}
8 changes: 8 additions & 0 deletions ...annotations-test/src/test/java/org/androidannotations/test/ViewsInjectedActivityTest.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 @@ -87,6 +88,13 @@ public void methodInjectedViewsNotNullAndHasTwoElements() {
assertThat(activity.methodInjectedViews).hasSize(2);
}

@Test
public void methodInjectedViewsNotNullAndHasTwoElements2() {
ViewsInjectionOrderActivity_ inOrderActivity = Robolectric.buildActivity(ViewsInjectionOrderActivity_.class).create().get();
assertThat(inOrderActivity.methodInjectedViews).isNotNull();
assertThat(inOrderActivity.methodInjectedViews).hasSize(2);
}

@Test
public void multiInjectedViewsNotNullAndHasTwoElements() {
assertThat(activity.multiInjectedViews).isNotNull();
Expand Down