Skip to content
This repository was archived by the owner on Jul 25, 2019. It is now read-only.

Commit 005242d

Browse files
evantevant
committed
removed old unit test model
1 parent 8577838 commit 005242d

10 files changed

+49
-205
lines changed

‎.idea/gradle.xml

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/libs.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.idea/vcs.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidStudioUnitTestPlugin.iml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="PLUGIN_MODULE" version="4">
2+
<module external.linked.project.id="AndroidStudioUnitTestPlugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="PLUGIN_MODULE" version="4">
33
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
4-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<component name="NewModuleRootManager" inherit-compiler-output="false">
5+
<output url="file://$MODULE_DIR$/build" />
6+
<output-test url="file://$MODULE_DIR$/build" />
57
<exclude-output />
68
<content url="file://$MODULE_DIR$">
79
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
10+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
811
</content>
912
<orderEntry type="inheritedJdk" />
1013
<orderEntry type="sourceFolder" forTests="false" />
@@ -29,6 +32,5 @@
2932
<SOURCES />
3033
</library>
3134
</orderEntry>
32-
<orderEntry type="library" name="me.tatarka.androidunittest:android-unit-test-model:1.0" level="project" />
3335
</component>
3436
</module>

‎AndroidStudioUnitTestPlugin.zip

-4.5 KB
Binary file not shown.

‎src/me/tatarka/androidunittest/idea/AndroidUnitTestProjectResolver.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.intellij.openapi.externalSystem.util.Order;
1515
import com.intellij.openapi.util.io.FileUtil;
1616
import com.intellij.util.containers.ContainerUtil;
17-
import me.tatarka.androidunittest.model.AndroidUnitTest;
1817
import org.gradle.tooling.model.gradle.GradleScript;
1918
import org.gradle.tooling.model.idea.IdeaModule;
2019
import org.jetbrains.annotations.NotNull;
@@ -47,15 +46,10 @@ public void populateModuleExtraModels(@NotNull IdeaModule gradleModule, @NotNull
4746
File moduleRootDirPath = moduleFilePath.getParentFile();
4847

4948
AndroidProject androidProject = resolverCtx.getExtraProject(gradleModule, AndroidProject.class);
50-
AndroidUnitTest androidUnitTest = resolverCtx.getExtraProject(gradleModule, AndroidUnitTest.class);
51-
52-
if (androidUnitTest != null) {
53-
LOGGER.warn("Using version <= 1.4.0 of the unit-test-plugin may not be supported in the future.");
54-
}
5549

5650
if (androidProject != null) {
5751
Variant selectedVariant = getVariantToSelect(androidProject);
58-
IdeaAndroidUnitTest ideaAndroidUnitTest = new IdeaAndroidUnitTest(gradleModule.getName(), moduleRootDirPath, androidProject, androidUnitTest, selectedVariant.getName());
52+
IdeaAndroidUnitTest ideaAndroidUnitTest = new IdeaAndroidUnitTest(gradleModule.getName(), moduleRootDirPath, androidProject, selectedVariant.getName());
5953
ideModule.createChild(AndroidUnitTestKeys.IDEA_ANDROID_UNIT_TEST, ideaAndroidUnitTest);
6054
}
6155
}
@@ -88,7 +82,7 @@ public int compare(Variant o1, Variant o2) {
8882
@Override
8983
@NotNull
9084
public Set<Class> getExtraProjectModelClasses() {
91-
return Sets.<Class>newHashSet(AndroidProject.class, AndroidUnitTest.class);
85+
return Sets.<Class>newHashSet(AndroidProject.class);
9286
}
9387

9488
@Override

‎src/me/tatarka/androidunittest/idea/ContentRootModuleCustomizer.java

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import com.android.builder.model.JavaArtifact;
44
import com.android.builder.model.SourceProvider;
5+
import com.android.builder.model.Variant;
56
import com.google.common.collect.Lists;
67
import com.intellij.openapi.roots.ContentEntry;
78
import com.intellij.openapi.roots.ModifiableRootModel;
89
import com.intellij.openapi.util.io.FileUtil;
910
import com.intellij.openapi.vfs.VfsUtilCore;
1011
import com.intellij.openapi.vfs.VirtualFile;
11-
import me.tatarka.androidunittest.model.Variant;
1212
import org.jetbrains.annotations.NotNull;
1313
import org.jetbrains.jps.model.java.JavaResourceRootType;
1414
import org.jetbrains.jps.model.java.JavaSourceRootType;
@@ -34,50 +34,23 @@ protected Collection<ContentEntry> findOrCreateContentEntries(@NotNull Modifiabl
3434
}
3535

3636
JavaArtifact selectedTestJavaArtifact = androidUnitTest.getSelectedTestJavaArtifact();
37-
if (selectedTestJavaArtifact != null) {
38-
setCompilerOutputPath(model, selectedTestJavaArtifact.getClassesFolder(), true);
39-
} else {
40-
oldFindOrCreateContentEntries(model, androidUnitTest);
41-
}
37+
setCompilerOutputPath(model, selectedTestJavaArtifact.getClassesFolder(), true);
4238

4339
return contentEntries;
4440
}
4541

46-
@Deprecated
47-
protected void oldFindOrCreateContentEntries(@NotNull ModifiableRootModel model, @NotNull IdeaAndroidUnitTest androidUnitTest) {
48-
Variant selectedTestVariant = androidUnitTest.getSelectedTestVariant();
49-
if (selectedTestVariant != null) {
50-
setCompilerOutputPath(model, selectedTestVariant.getCompileDestinationDirectory(), true);
51-
}
52-
}
53-
5442
@Override
5543
protected void setUpContentEntries(@NotNull Collection<ContentEntry> contentEntries, @NotNull IdeaAndroidUnitTest androidUnitTest, @NotNull List<RootSourceFolder> orphans) {
5644
JavaArtifact selectedTestJavaArtifact = androidUnitTest.getSelectedTestJavaArtifact();
57-
if (selectedTestJavaArtifact != null) {
58-
SourceProvider sourceProvider = selectedTestJavaArtifact.getVariantSourceProvider();
45+
SourceProvider sourceProvider = selectedTestJavaArtifact.getVariantSourceProvider();
5946

60-
Collection<File> testSources = sourceProvider.getJavaDirectories();
61-
for (File source : testSources) {
62-
addSourceFolder(contentEntries, source, JavaSourceRootType.TEST_SOURCE, false, orphans);
63-
}
64-
Collection<File> testResources = sourceProvider.getResourcesDirectories();
65-
for (File resource : testResources) {
66-
addSourceFolder(contentEntries, resource, JavaResourceRootType.TEST_RESOURCE, false, orphans);
67-
}
68-
} else {
69-
oldSetUpContentEntries(contentEntries, androidUnitTest, orphans);
47+
Collection<File> testSources = sourceProvider.getJavaDirectories();
48+
for (File source : testSources) {
49+
addSourceFolder(contentEntries, source, JavaSourceRootType.TEST_SOURCE, false, orphans);
7050
}
71-
}
72-
73-
@Deprecated
74-
protected void oldSetUpContentEntries(@NotNull Collection<ContentEntry> contentEntries, @NotNull IdeaAndroidUnitTest androidUnitTest, @NotNull List<RootSourceFolder> orphans) {
75-
Variant selectedTestVariant = androidUnitTest.getSelectedTestVariant();
76-
if (selectedTestVariant != null) {
77-
Collection<File> testSources = selectedTestVariant.getSourceDirectories();
78-
for (File source : testSources) {
79-
addSourceFolder(contentEntries, source, JavaSourceRootType.TEST_SOURCE, false, orphans);
80-
}
51+
Collection<File> testResources = sourceProvider.getResourcesDirectories();
52+
for (File resource : testResources) {
53+
addSourceFolder(contentEntries, resource, JavaResourceRootType.TEST_RESOURCE, false, orphans);
8154
}
8255
}
8356
}

‎src/me/tatarka/androidunittest/idea/DependenciesModuleCustomizer.java

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package me.tatarka.androidunittest.idea;
22

3-
import com.android.builder.model.AndroidLibrary;
4-
import com.android.builder.model.Dependencies;
5-
import com.android.builder.model.JavaArtifact;
6-
import com.android.builder.model.JavaLibrary;
3+
import com.android.builder.model.*;
74
import com.android.tools.idea.gradle.dependency.LibraryDependency;
85
import com.android.tools.idea.gradle.dependency.ModuleDependency;
96
import com.android.tools.idea.gradle.facet.AndroidGradleFacet;
@@ -19,7 +16,6 @@
1916
import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable;
2017
import com.intellij.openapi.roots.libraries.Library;
2118
import com.intellij.openapi.roots.libraries.LibraryTable;
22-
import me.tatarka.androidunittest.model.Variant;
2319
import org.jetbrains.annotations.NotNull;
2420
import org.jetbrains.annotations.Nullable;
2521

@@ -39,38 +35,20 @@ public class DependenciesModuleCustomizer extends AbstractDependenciesModuleCust
3935
protected void setUpDependencies(@NotNull ModifiableRootModel rootModel, @NotNull IdeaAndroidUnitTest androidUnitTest, @NotNull List<Message> errorsFound) {
4036
JavaArtifact selectedTestJavaArtifact = androidUnitTest.getSelectedTestJavaArtifact();
4137

42-
if (selectedTestJavaArtifact != null) {
43-
Dependencies dependencies = selectedTestJavaArtifact.getDependencies();
44-
for (JavaLibrary library : dependencies.getJavaLibraries()) {
45-
updateDependency(rootModel, library.getJarFile());
46-
}
47-
for (AndroidLibrary library : dependencies.getLibraries()) {
48-
updateDependency(rootModel, library.getFolder());
49-
}
50-
for (String project : dependencies.getProjects()) {
51-
updateDependency(rootModel, project, errorsFound);
52-
}
53-
} else {
54-
oldSetUpDependencies(rootModel, androidUnitTest, errorsFound);
38+
Dependencies dependencies = selectedTestJavaArtifact.getDependencies();
39+
for (JavaLibrary library : dependencies.getJavaLibraries()) {
40+
updateDependency(rootModel, library.getJarFile());
41+
}
42+
for (AndroidLibrary library : dependencies.getLibraries()) {
43+
updateDependency(rootModel, library.getFolder());
44+
}
45+
for (String project : dependencies.getProjects()) {
46+
updateDependency(rootModel, project, errorsFound);
5547
}
5648

5749
updateDependenciesWithJavadocSources(rootModel, androidUnitTest);
5850
}
5951

60-
@Deprecated
61-
protected void oldSetUpDependencies(@NotNull ModifiableRootModel rootModel, @NotNull IdeaAndroidUnitTest androidUnitTest, @NotNull List<Message> errorsFound) {
62-
Variant selectedTestVariant = androidUnitTest.getSelectedTestVariant();
63-
64-
if (selectedTestVariant != null) {
65-
for (File library : selectedTestVariant.getJavaDependencies()) {
66-
updateDependency(rootModel, library);
67-
}
68-
for (String gradleProjectPath : selectedTestVariant.getProjectDependencies()) {
69-
updateDependency(rootModel, gradleProjectPath, errorsFound);
70-
}
71-
}
72-
}
73-
7452
private void updateDependency(@NotNull ModifiableRootModel model, @NotNull File library) {
7553
LibraryDependency libraryDependency = new LibraryDependency(library, DependencyScope.TEST);
7654
updateDependency(model, libraryDependency);

‎src/me/tatarka/androidunittest/idea/IdeaAndroidUnitTest.java

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.intellij.openapi.util.io.FileUtil;
66
import com.intellij.openapi.vfs.VfsUtil;
77
import com.intellij.openapi.vfs.VirtualFile;
8-
import me.tatarka.androidunittest.model.AndroidUnitTest;
98
import org.jetbrains.annotations.NotNull;
109
import org.jetbrains.annotations.Nullable;
1110

@@ -25,26 +24,22 @@ public class IdeaAndroidUnitTest implements Serializable {
2524
@NotNull private final String myModuleName;
2625
@NotNull private final VirtualFile myRootDir;
2726
@NotNull private final AndroidProject myAndroidDelegate;
28-
@Deprecated @Nullable private final AndroidUnitTest myTestDelegate;
2927
@Nullable private String mySelectedVariantName;
3028

3129
@NotNull private Map<String, Variant> myAndroidVariantsByName = Maps.newHashMap();
3230
@NotNull private Map<String, JavaArtifact> myTestJavaArtifacts = Maps.newHashMap();
33-
@Deprecated @NotNull private Map<String, me.tatarka.androidunittest.model.Variant> myTestVariantsByName = Maps.newHashMap();
3431

3532
@NotNull private Map<String, File> myJavadocs = Maps.newHashMap();
3633
@NotNull private Map<String, File> mySources = Maps.newHashMap();
3734

38-
public IdeaAndroidUnitTest(@NotNull String moduleName, @NotNull File rootDir, @NotNull AndroidProject androidDelegate, @Nullable AndroidUnitTest testDelegate, @NotNull String selectedVariantName) {
35+
public IdeaAndroidUnitTest(@NotNull String moduleName, @NotNull File rootDir, @NotNull AndroidProject androidDelegate, @NotNull String selectedVariantName) {
3936
myModuleName = moduleName;
4037
VirtualFile found = VfsUtil.findFileByIoFile(rootDir, true);
4138
assert found != null;
4239
myRootDir = found;
4340
myAndroidDelegate = androidDelegate;
44-
myTestDelegate = testDelegate;
4541

4642
populateVariantsByName();
47-
oldPopulateVariantsByName();
4843

4944
setSelectedVariantName(selectedVariantName);
5045
map.put(androidDelegate, this);
@@ -65,15 +60,6 @@ private void populateVariantsByName() {
6560
}
6661
}
6762

68-
@Deprecated
69-
private void oldPopulateVariantsByName() {
70-
if (myTestDelegate != null) {
71-
for (me.tatarka.androidunittest.model.Variant variant : myTestDelegate.getVariants()) {
72-
myTestVariantsByName.put(variant.getName(), variant);
73-
}
74-
}
75-
}
76-
7763
private void populateJavadocSourcesMaps() {
7864
JavaArtifact javadocSourcesArtifact = findJavadocSourcesArtifact();
7965
if (javadocSourcesArtifact == null) {
@@ -117,12 +103,6 @@ public JavaArtifact getSelectedTestJavaArtifact() {
117103
return myTestJavaArtifacts.get(mySelectedVariantName);
118104
}
119105

120-
@Deprecated
121-
@Nullable
122-
me.tatarka.androidunittest.model.Variant getSelectedTestVariant() {
123-
return myTestVariantsByName.get(mySelectedVariantName);
124-
}
125-
126106
@Nullable
127107
public Variant getSelectedAndroidVariant() {
128108
return myAndroidVariantsByName.get(mySelectedVariantName);
@@ -139,10 +119,6 @@ public Collection<String> getVariantNames() {
139119
@NotNull
140120
public AndroidProject getAndroidDelegate() { return myAndroidDelegate; }
141121

142-
@Deprecated
143-
@Nullable
144-
public AndroidUnitTest getTestDelegate() { return myTestDelegate; }
145-
146122
@NotNull
147123
public VirtualFile getRootDir() { return myRootDir; }
148124

0 commit comments

Comments
 (0)