Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a logic to find common package name #147

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix a logic to find common package name #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aabfc16
Fix a logic to find common package name
sakuna63 Jan 9, 2017
4a49659
Fix foundamental issue
sakuna63 Jan 10, 2017
3f2e1bd
Add test
sakuna63 Jan 10, 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
29 changes: 26 additions & 3 deletions ...processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec;

import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import javax.lang.model.element.Modifier;
Expand Down Expand Up @@ -137,16 +140,36 @@ private String findCommonPackage(Collection<InjectionTarget> targets) {

private String findCommonPackage(String commonPackageName, String packageName) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the method that you should test, in a unit test.

int indexCommon = 0;
int maxLength = Math.min(commonPackageName.length(), packageName.length());
String[] commonPackages = splitIntoPackages(commonPackageName);
String[] packages = splitIntoPackages(packageName);
int maxLength = Math.min(commonPackages.length, packages.length);
for (; indexCommon < maxLength; indexCommon++) {
if (commonPackageName.charAt(indexCommon) != packageName.charAt(indexCommon)) {
if (!commonPackages[indexCommon].equals(packages[indexCommon])) {
break;
}
}
String commonRoot = packageName.substring(0, indexCommon);

String commonRoot = join(Arrays.copyOfRange(packages, 0, indexCommon), ".");
return commonRoot;
}

private String[] splitIntoPackages(String packageName) {
String[] packages = packageName.split("\\.");
if (packages.length == 0) {
return new String[] {packageName};
}
return packages;
}

private String join(String[] strs, String delimiter) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < strs.length; i++) {
if (i != 0) sb.append(delimiter);
sb.append(strs[i]);
}
return sb.toString();
}

private Collection<String> getClassNamesWhereHensonCanGoto(Collection<InjectionTarget> targets) {
Collection<String> classNames = new HashSet<>();
for (InjectionTarget injectionTarget : targets) {
Expand Down
111 changes: 111 additions & 0 deletions ...essor/src/test/java/com/f2prateek/dart/henson/processor/HensonNavigatorGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
import com.google.common.base.Joiner;
import com.google.testing.compile.JavaFileObjects;
import javax.tools.JavaFileObject;

import com.google.testing.compile.JavaSourcesSubjectFactory;
import org.junit.Test;

import java.util.Arrays;

import static com.google.common.truth.Truth.assert_;
import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;

Expand Down Expand Up @@ -278,4 +283,110 @@ public class HensonNavigatorGeneratorTest {
.and()
.generatesSources(expectedSource1);
}

@Test public void samePackage() throws Exception {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should add unit tests for the code you added. Not a generator test to test a lookup method in package name..

JavaFileObject source1 = JavaFileObjects.forSourceString("test.TestOne", Joiner.on('\n').join( //
"package test;", //
"import android.app.Activity;", //
"import com.f2prateek.dart.InjectExtra;", //
"public class TestOne extends Activity {", //
" @InjectExtra(\"key\") String extra;", //
"}" //
));

JavaFileObject source2 = JavaFileObjects.forSourceString("test.TestTwo", Joiner.on('\n').join( //
"package test;", //
"import android.app.Activity;", //
"import com.f2prateek.dart.InjectExtra;", //
"public class TestTwo extends Activity {", //
" @InjectExtra(\"key\") String extra;", //
"}" //
));

JavaFileObject expectedSource =
JavaFileObjects.forSourceString("test/Henson", Joiner.on('\n').join( //
"package test;", //
"import android.content.Context;", //
"public class Henson {", //
" private Henson() {", //
" }", //
" public static WithContextSetState with(Context context) {", //
" return new test.Henson.WithContextSetState(context);", //
" }", //
" public static class WithContextSetState {", //
" private Context context;", //
" private WithContextSetState(Context context) {", //
" this.context = context;", //
" }", //
" public TestOne$$IntentBuilder gotoTestOne() {", //
" return new test.TestOne$$IntentBuilder(context);", //
" }", //
" public TestTwo$$IntentBuilder gotoTestTwo() {", //
" return new test.TestTwo$$IntentBuilder(context);", //
" }", //
" }", //
"}" //
));

assert_().about(JavaSourcesSubjectFactory.javaSources())
.that(Arrays.asList(source1, source2))
.processedWith(ProcessorTestUtilities.hensonProcessors())
.compilesWithoutError()
.and()
.generatesSources(expectedSource);
}

@Test public void differentPackage() throws Exception {
JavaFileObject source1 = JavaFileObjects.forSourceString("test.test1.TestOne", Joiner.on('\n').join( //
"package test.test1;", //
"import android.app.Activity;", //
"import com.f2prateek.dart.InjectExtra;", //
"public class TestOne extends Activity {", //
" @InjectExtra(\"key\") String extra;", //
"}" //
));

JavaFileObject source2 = JavaFileObjects.forSourceString("test.test2.TestTwo", Joiner.on('\n').join( //
"package test.test2;", //
"import android.app.Activity;", //
"import com.f2prateek.dart.InjectExtra;", //
"public class TestTwo extends Activity {", //
" @InjectExtra(\"key\") String extra;", //
"}" //
));

JavaFileObject expectedSource =
JavaFileObjects.forSourceString("test/Henson", Joiner.on('\n').join( //
"package test;", //
"import android.content.Context;", //
"import test.test1.TestOne$$IntentBuilder;", //
"import test.test2.TestTwo$$IntentBuilder;", //
"public class Henson {", //
" private Henson() {", //
" }", //
" public static WithContextSetState with(Context context) {", //
" return new test.Henson.WithContextSetState(context);", //
" }", //
" public static class WithContextSetState {", //
" private Context context;", //
" private WithContextSetState(Context context) {", //
" this.context = context;", //
" }", //
" public TestOne$$IntentBuilder gotoTestOne() {", //
" return new test.test1.TestOne$$IntentBuilder(context);", //
" }", //
" public TestTwo$$IntentBuilder gotoTestTwo() {", //
" return new test.test2.TestTwo$$IntentBuilder(context);", //
" }", //
" }", //
"}" //
));

assert_().about(JavaSourcesSubjectFactory.javaSources())
.that(Arrays.asList(source1, source2))
.processedWith(ProcessorTestUtilities.hensonProcessors())
.compilesWithoutError()
.and()
.generatesSources(expectedSource);
}
}