[Mercurial] Moved tests to the .test subpackage.

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/AbstractHgTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/AbstractHgTestCase.java
index cf110608bd407ce101cf390a16ce31bbebdb94fc..c1df16416bf9ab3cb660661def73fa0042aa2f06 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/AbstractHgTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.application.PluginPathManager;
@@ -24,7 +24,8 @@ import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.vcsUtil.VcsUtil;
 import org.testng.annotations.BeforeMethod;
-import org.zmlx.hg4idea.test.TestChangeListManager;
+import org.zmlx.hg4idea.HgFile;
+import org.zmlx.hg4idea.HgVcs;
 
 import java.io.*;
 

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgAddTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgAddTestCase.java
index 84755453a10ff665683028915baf6c437dc31d85..5c5ad4763fb17e6f0a51d5871124926857d40930 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgAddTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.annotations.Test;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgCopyTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgCopyTestCase.java
index 5288f98a17e24600d0618f2cafde2754a866f4ee..74e61d02cd209198addabc8a91baf1672515d585 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgCopyTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.annotations.Test;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTestCase.java
index 2e46e5b0668ca6ce41813a07e1a6baea32c77b13..7144af3216be72af6ed5cb9619b4887e5172ac98 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.Assert;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgFromClonedTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgFromClonedTestCase.java
index d5ebdb7fcc00b1e87dab0c77c0c841ca89ac2419..d4eab2111280a60a5c7775584b481416a697ad57 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgFromClonedTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -19,6 +19,7 @@ import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.vcsUtil.VcsUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.zmlx.hg4idea.HgVcs;
 
 import java.io.File;
 

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgHistoryTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgHistoryTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTestCase.java
index 1cfc4ac5f6f148fd4f9ac4ac716bf709c4d83391..713b0455f44418208d9fafdaaff46ad727e0071d 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgHistoryTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTestCase.java
@@ -1,10 +1,11 @@
-package org.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistorySession;
 import com.intellij.vcsUtil.VcsUtil;
 import org.testng.annotations.Test;
+import org.zmlx.hg4idea.HgVcs;
 
 import java.io.File;
 import java.util.Collection;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgLogTestCase.java
similarity index 95%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgLogTestCase.java
index 3ca617d2cfd08baa047bf5f4433aa533084dea51..be90f35a70ca3c81062bc6d900b52b798fa0fd5d 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgLogTestCase.java
@@ -10,9 +10,10 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import org.testng.annotations.Test;
+import org.zmlx.hg4idea.HgFileRevision;
 import org.zmlx.hg4idea.command.HgLogCommand;
 
 import java.util.List;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMoveTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMoveTestCase.java
index def256e6a0f27218939cf62e158bf57b0f9f86b3..841cc7de22c73f39d991befab2dfef03fe7de21e 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMoveTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.annotations.Test;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRenameTestCase.java
similarity index 99%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRenameTestCase.java
index a97949c990d17e4c86fd3b638ee52953dd465610..55160e1b401141eadf11d87b2502c03cf555a7a7 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRenameTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.annotations.Test;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgResolveConflictTestCase.java
similarity index 98%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgResolveConflictTestCase.java
index 8d1443264c5fdf0c50b7dfe410169338fb68478a..bdb38f402b0d7dc4484ee83399aed86225df972f 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgResolveConflictTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.Assert;

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRevertTestCase.java
similarity index 95%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRevertTestCase.java
index 14e895755f1c3bd5bfc14d0d8396d25568a52948..1a894840f5d5ec6b269c4da40e29d55c2fe20862 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgRevertTestCase.java
@@ -1,6 +1,7 @@
-package org.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import org.testng.annotations.Test;
+import org.zmlx.hg4idea.HgRevisionNumber;
 import org.zmlx.hg4idea.command.HgCatCommand;
 import org.zmlx.hg4idea.command.HgRevertCommand;
 

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTestCase.java
similarity index 99%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTestCase.java
index 4fed9d4d2dbecd96d2afad4cf6490c95d75cdc8c..619f0e231675e03650d6fb32fedcd809abac718f 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.progress.EmptyProgressIndicator;
@@ -18,6 +18,8 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.testng.annotations.Test;
+import org.zmlx.hg4idea.HgFile;
+import org.zmlx.hg4idea.HgRevisionNumber;
 import org.zmlx.hg4idea.command.*;
 import org.zmlx.hg4idea.provider.update.HgRegularUpdater;
 

diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUrlTestCase.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUrlTestCase.java
similarity index 99%
rename from plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUrlTestCase.java
rename to plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUrlTestCase.java
index 0cda4bc06df86f723e32a1e6d426ecd76cefcd33..ed7f7086aaefc7f5672d3f8820f6502dc91a5ce5 100644 (file)
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUrlTestCase.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUrlTestCase.java
@@ -10,7 +10,7 @@
 // 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.zmlx.hg4idea;
+package org.zmlx.hg4idea.test;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;