Merge pull request #4 from loosebazooka/fixTests automerge: f86be40
automerge: 789eab7
* commit '789eab79e9c625b99be1180d8ceabdd484e91edf':
Fix tests for new test path
diff --git a/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_startWithNumber/expected.xml b/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_startWithNumber/expected.xml
index f341d0d..ee9543a 100644
--- a/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_startWithNumber/expected.xml
+++ b/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_startWithNumber/expected.xml
@@ -2,7 +2,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>5</line>
+ <line>20</line>
<description>Invalid api name: it must start with a lower case letter and consists only of letter and digits</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_withSpecialCharacter/expected.xml b/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_withSpecialCharacter/expected.xml
index f341d0d..ee9543a 100644
--- a/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_withSpecialCharacter/expected.xml
+++ b/core-plugin/testData/inspections/apiNameInspection/apiNameAttribute_withSpecialCharacter/expected.xml
@@ -2,7 +2,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>5</line>
+ <line>20</line>
<description>Invalid api name: it must start with a lower case letter and consists only of letter and digits</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyOwnerDomain/expected.xml b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyOwnerDomain/expected.xml
index 280f745..d788aaa 100644
--- a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyOwnerDomain/expected.xml
+++ b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyOwnerDomain/expected.xml
@@ -2,7 +2,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>7</line>
+ <line>22</line>
<description>Invalid namespace configuration. If a namespace is set, make sure to set an Owner Domain and Name. Package Path is optional.</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyPackagePath/expected.xml b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyPackagePath/expected.xml
index 280f745..d788aaa 100644
--- a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyPackagePath/expected.xml
+++ b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withOnlyPackagePath/expected.xml
@@ -2,7 +2,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>7</line>
+ <line>22</line>
<description>Invalid namespace configuration. If a namespace is set, make sure to set an Owner Domain and Name. Package Path is optional.</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withoutOwnerName/expected.xml b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withoutOwnerName/expected.xml
index 280f745..d788aaa 100644
--- a/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withoutOwnerName/expected.xml
+++ b/core-plugin/testData/inspections/apiNamespaceInspection/apiNamespaceAttribute_withoutOwnerName/expected.xml
@@ -2,7 +2,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>7</line>
+ <line>22</line>
<description>Invalid namespace configuration. If a namespace is set, make sure to set an Owner Domain and Name. Package Path is optional.</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testData/inspections/constructorInspection/classWithPrivateConstructor/expected.xml b/core-plugin/testData/inspections/constructorInspection/classWithPrivateConstructor/expected.xml
index 24f3c0f..29e7dd1 100644
--- a/core-plugin/testData/inspections/constructorInspection/classWithPrivateConstructor/expected.xml
+++ b/core-plugin/testData/inspections/constructorInspection/classWithPrivateConstructor/expected.xml
@@ -17,7 +17,7 @@
<problems>
<problem>
<file>test.java</file>
- <line>5</line>
+ <line>20</line>
<description>Each class that is within an API must have a public nullary constructor.</description>
</problem>
</problems>
\ No newline at end of file
diff --git a/core-plugin/testSrc/com/google/gct/idea/appengine/validation/EndpointTestBase.java b/core-plugin/testSrc/com/google/gct/idea/appengine/validation/EndpointTestBase.java
index d953f95..ed53a6a 100644
--- a/core-plugin/testSrc/com/google/gct/idea/appengine/validation/EndpointTestBase.java
+++ b/core-plugin/testSrc/com/google/gct/idea/appengine/validation/EndpointTestBase.java
@@ -28,12 +28,12 @@
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
-public class EndpointTestBase extends JavaCodeInsightFixtureTestCase {
+public abstract class EndpointTestBase extends JavaCodeInsightFixtureTestCase {
@Override
protected String getTestDataPath() {
String homePath = PathManagerEx.getHomePath(getClass());
String homePathParent = homePath.substring(0, homePath.lastIndexOf('/'));
- return homePathParent + FileUtil.toSystemDependentName("/studio/google/cloud/tools/testData/");
+ return homePathParent + FileUtil.toSystemDependentName("/studio/google/cloud/tools/core-plugin/testData/");
}
@Override
