Propagated some changes in the extension point.
Change-Id: Ib125035ba9886c8736a70a8960b70cbf10de6b4c
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index b327200..a4cf6e9 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -40,8 +40,10 @@
</extensions>
<extensions defaultExtensionNs="com.android.tools.idea">
- <run.cloudTestingConfigurationFactory id="myCloudTestConfigurationProvider" order="first" implementation="com.google.gct.testing.CloudTestConfigurationProviderImpl"/>
- </extensions>
+ <run.cloudTestingConfigurationProvider id="myCloudTestConfigurationProvider" order="first" implementation="com.google.gct.testing.CloudTestConfigurationProviderImpl"/>
+</extensions>
+
+
<extensionPoints>
<extensionPoint name="googleTestingListener" interface="com.google.gct.testing.GoogleTestingListener"/>
diff --git a/src/com/google/gct/testing/CloudConfigurationChooserDialog.java b/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
index ee99fa6..9837c11 100644
--- a/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
+++ b/src/com/google/gct/testing/CloudConfigurationChooserDialog.java
@@ -166,7 +166,7 @@
} else if (node.getUserObject() instanceof CloudTestConfigurationImpl) {
CloudTestConfigurationImpl config = (CloudTestConfigurationImpl) node.getUserObject();
//TODO: Remove the cap > 100
- boolean isInvalidConfiguration = config.count() < 1 || config.count() > 100;
+ boolean isInvalidConfiguration = config.getDeviceConfigurationCount() < 1 || config.getDeviceConfigurationCount() > 100;
boolean oldMySelected = mySelected;
// This is a trick to avoid using white color for the selected element if it has to be red.
if (isInvalidConfiguration) {
diff --git a/src/com/google/gct/testing/CloudTestConfigurationImpl.java b/src/com/google/gct/testing/CloudTestConfigurationImpl.java
index fa820d6..533e121 100644
--- a/src/com/google/gct/testing/CloudTestConfigurationImpl.java
+++ b/src/com/google/gct/testing/CloudTestConfigurationImpl.java
@@ -126,7 +126,7 @@
@Override
public String getDisplayName() {
- return name + " (" + count() + ")";
+ return name + " (" + getDeviceConfigurationCount() + ")";
}
public void setName(String name) {
@@ -175,7 +175,7 @@
* by all of the types enabled in this configuration.
*/
@Override
- public int count() {
+ public int getDeviceConfigurationCount() {
int product = 1;
for (GoogleCloudTestingDimension dimension : getDimensions()) {
@@ -222,10 +222,10 @@
}
/**
- * Precondition: count() > 0.
+ * Precondition: getDeviceConfigurationCount() > 0.
*/
public String prepareMatrixTestRequest() {
- Preconditions.checkState(count() > 0, "There should be at least one combination in a matrix test request!");
+ Preconditions.checkState(getDeviceConfigurationCount() > 0, "There should be at least one combination in a matrix test request!");
StringBuffer bf = new StringBuffer();
diff --git a/src/com/google/gct/testing/CloudTestConfigurationProviderImpl.java b/src/com/google/gct/testing/CloudTestConfigurationProviderImpl.java
index 1e42e5e..3510c69 100644
--- a/src/com/google/gct/testing/CloudTestConfigurationProviderImpl.java
+++ b/src/com/google/gct/testing/CloudTestConfigurationProviderImpl.java
@@ -248,7 +248,7 @@
private void performTestsInCloud(final CloudTestConfigurationImpl googleCloudTestingConfiguration, final String cloudProjectId,
final AndroidRunningState runningState, final GoogleCloudTestingResultParser cloudResultParser) {
- if (googleCloudTestingConfiguration != null && googleCloudTestingConfiguration.count() > 0) {
+ if (googleCloudTestingConfiguration != null && googleCloudTestingConfiguration.getDeviceConfigurationCount() > 0) {
final List<String> encodedMatrixInstances =
googleCloudTestingConfiguration.computeConfigurationInstances(ConfigurationInstance.ENCODED_NAME_DELIMITER);
final List<String> expectedConfigurationInstances =
diff --git a/src/com/google/gct/testing/TwoPanelTree.java b/src/com/google/gct/testing/TwoPanelTree.java
index 7cc7177..71c745d 100644
--- a/src/com/google/gct/testing/TwoPanelTree.java
+++ b/src/com/google/gct/testing/TwoPanelTree.java
@@ -154,7 +154,7 @@
}
private void updateConfigurationCountLabel() {
- int numberOfConfigurations = configuration.count();
+ int numberOfConfigurations = configuration.getDeviceConfigurationCount();
double coverage = computeCoverage(configuration.countCombinationsCollapsingOrientation()) * 100d;
//TODO: Put back the covered % after it is not fake (or it is needed for demo purposes).
//myConfigurationCountLabel.setText("<html>Tests will run on <b>" + numberOfConfigurations + " configurations</b> and cover <b>" +
