JAL-3032 MCview package renamed mc_view in test classes

diff --git a/test/jalview/ext/jmol/JmolParserTest.java b/test/jalview/ext/jmol/JmolParserTest.java
index f5e637c..a094fb0 100644 (file)
--- a/test/jalview/ext/jmol/JmolParserTest.java
+++ b/test/jalview/ext/jmol/JmolParserTest.java
@@ -42,7 +42,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import MCview.PDBfile;
+import mc_view.PDBfile;
 
 /**
  * @author jimp

diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
index d285b04..4c6fe44 100644 (file)
--- a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
+++ b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
@@ -32,7 +32,7 @@ import java.util.Vector;
 
 import org.testng.annotations.BeforeClass;
 
-import MCview.PDBfile;
+import mc_view.PDBfile;
 
 /**
  * This is not a unit test, rather it is a bulk End-to-End scan for sequences

diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java
index c6c1a29..7d0916b 100644 (file)
--- a/test/jalview/ext/paradise/TestAnnotate3D.java
+++ b/test/jalview/ext/paradise/TestAnnotate3D.java
@@ -40,9 +40,8 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import MCview.PDBfile;
-
 import compbio.util.FileUtil;
+import mc_view.PDBfile;
 
 public class TestAnnotate3D
 {

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index 9cd7061..8eb3796 100644 (file)
--- a/test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/test/jalview/io/AnnotatedPDBFileInputTest.java
@@ -116,7 +116,7 @@ public class AnnotatedPDBFileInputTest
         if (StructureImportSettings.getDefaultPDBFileParser()
                 .equals(StructureParser.JALVIEW_PARSER))
         {
-          assertTrue(MCview.PDBfile.isCalcIdForFile(aa, pdbId));
+          assertTrue(mc_view.PDBfile.isCalcIdForFile(aa, pdbId));
         }
       }
     }
@@ -248,10 +248,10 @@ public class AnnotatedPDBFileInputTest
         {
           System.err.println("CalcId " + ana.getCalcId());
           if (ana.getCalcId() != null
-                  && MCview.PDBfile.isCalcIdHandled(ana.getCalcId()))
+                  && mc_view.PDBfile.isCalcIdHandled(ana.getCalcId()))
           {
             exists = true;
-            if (MCview.PDBfile.isCalcIdForFile(ana, pdbentry.getId()))
+            if (mc_view.PDBfile.isCalcIdForFile(ana, pdbentry.getId()))
             {
               found = true;
             }

diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java
index 75c1413..6122d6d 100644 (file)
--- a/test/jalview/ws/sifts/SiftsClientTest.java
+++ b/test/jalview/ws/sifts/SiftsClientTest.java
@@ -48,8 +48,8 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import MCview.Atom;
-import MCview.PDBfile;
+import mc_view.Atom;
+import mc_view.PDBfile;
 
 public class SiftsClientTest
 {

diff --git a/test/MCview/AtomTest.java b/test/mc_view/AtomTest.java
similarity index 99%
rename from test/MCview/AtomTest.java
rename to test/mc_view/AtomTest.java
index 2d11fb5..e1b6d78 100644 (file)
--- a/test/MCview/AtomTest.java
+++ b/test/mc_view/AtomTest.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import static org.testng.AssertJUnit.assertEquals;
 

diff --git a/test/MCview/BondTest.java b/test/mc_view/BondTest.java
similarity index 99%
rename from test/MCview/BondTest.java
rename to test/mc_view/BondTest.java
index aa29ad0..42b0ff3 100644 (file)
--- a/test/MCview/BondTest.java
+++ b/test/mc_view/BondTest.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import static org.testng.AssertJUnit.assertEquals;
 

diff --git a/test/MCview/PDBChainTest.java b/test/mc_view/PDBChainTest.java
similarity index 99%
rename from test/MCview/PDBChainTest.java
rename to test/mc_view/PDBChainTest.java
index 533c0af..0f748ce 100644 (file)
--- a/test/MCview/PDBChainTest.java
+++ b/test/mc_view/PDBChainTest.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;

diff --git a/test/MCview/PDBfileTest.java b/test/mc_view/PDBfileTest.java
similarity index 99%
rename from test/MCview/PDBfileTest.java
rename to test/mc_view/PDBfileTest.java
index c07c62e..c99d185 100644 (file)
--- a/test/MCview/PDBfileTest.java
+++ b/test/mc_view/PDBfileTest.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;

diff --git a/test/MCview/ResidueTest.java b/test/mc_view/ResidueTest.java
similarity index 99%
rename from test/MCview/ResidueTest.java
rename to test/mc_view/ResidueTest.java
index 0acd681..c676cd3 100644 (file)
--- a/test/MCview/ResidueTest.java
+++ b/test/mc_view/ResidueTest.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;