From 2360f48ca9907aaf2cbd6ab9a868705156610c70 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 18 Sep 2015 13:54:47 +0100
Subject: [PATCH] JAL-1888 set verbosity and exclude the 'parallel' attribute
 so no parallel execution is performed for tests

---
 build.xml                |    3 +-
 utils/jalview_testng.xml |  114 ----------------------------------------------
 2 files changed, 2 insertions(+), 115 deletions(-)
 delete mode 100644 utils/jalview_testng.xml

diff --git a/build.xml b/build.xml
index 73c494d..2b81b21 100755
--- a/build.xml
+++ b/build.xml
@@ -280,7 +280,8 @@
   <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
 
   <target name="testng" depends="buildTests">
-    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng">
+    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
+      verbose="2">
       <classpath>
         <pathelement location="${testOutputDir}" />
         <path refid="test.classpath" />
diff --git a/utils/jalview_testng.xml b/utils/jalview_testng.xml
deleted file mode 100644
index ba9e660..0000000
--- a/utils/jalview_testng.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
- * 
- * This file is part of Jalview.
- * 
- * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *  
- * Jalview is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty 
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
- * PURPOSE.  See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
- * The Jalview Authors are detailed in the 'AUTHORS' file.
--->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Suite" parallel="none">
-  <test verbose="2" name="Test">
-    <classes>
-      <class name="jalview.gui.AlignViewportTest"/>
-      <class name="jalview.util.ShiftListTest"/>
-      <class name="jalview.util.ColorUtilsTest"/>
-      <class name="jalview.gui.PDBSearchPanelTest"/>
-      <class name="MCview.PDBfileTest"/>
-      <class name="jalview.io.BioJsHTMLOutputTest"/>
-      <class name="jalview.io.JSONFileTest"/>
-      <class name="jalview.ext.jmol.PDBFileWithJmolTest"/>
-      <class name="jalview.ws.jabaws.RNAStructExportImport"/>
-      <class name="jalview.ext.paradise.TestAnnotate3D"/>
-      <class name="MCview.PDBChainTest"/>
-      <class name="jalview.io.StockholmFileTest"/>
-      <class name="jalview.schemes.ScoreMatrixPrinter"/>
-      <class name="jalview.datamodel.SearchResultsTest"/>
-      <class name="jalview.ws.seqfetcher.DasSequenceFetcher"/>
-      <class name="jalview.util.DBRefUtilsTest"/>
-      <class name="jalview.analysis.CrossRefTest"/>
-      <class name="jalview.ws.jabaws.MinJabawsClientTests"/>
-      <class name="jalview.datamodel.AlignedCodonTest"/>
-      <class name="MCview.AtomTest"/>
-      <class name="jalview.gui.PopupMenuTest"/>
-      <class name="jalview.viewmodel.styles.ViewStyleTest"/>
-      <class name="jalview.io.AnnotationFileIOTest"/>
-      <class name="jalview.ws.jws2.ParameterUtilsTest"/>
-      <class name="jalview.io.RNAMLfileTest"/>
-      <class name="jalview.analysis.AlignmentUtilsTests"/>
-      <class name="jalview.gui.SequenceRendererTest"/>
-      <class name="jalview.bin.CommandLineOperations"/>
-      <class name="jalview.gui.PaintRefresherTest"/>
-      <class name="jalview.ws.seqfetcher.DbRefFetcherTest"/>
-      <class name="jalview.datamodel.AlignmentAnnotationTests"/>
-      <class name="jalview.schemes.ResiduePropertiesTest"/>
-      <class name="jalview.ext.rbvi.chimera.ChimeraCommandsTest"/>
-      <class name="MCview.ResidueTest"/>
-      <class name="jalview.io.PhylipFileTests"/>
-      <class name="jalview.util.MappingUtilsTest"/>
-      <class name="jalview.ws.jabaws.DisorderAnnotExportImport"/>
-      <class name="jalview.analysis.GroupingTest"/>
-      <class name="jalview.analysis.AnnotationSorterTest"/>
-      <class name="jalview.io.FileIOTester"/>
-      <class name="jalview.util.MapListTest"/>
-      <class name="jalview.datamodel.ColumnSelectionTest"/>
-      <class name="jalview.ext.rbvi.chimera.ChimeraConnect"/>
-      <class name="jalview.gui.ProgressBarTest"/>
-      <class name="jalview.analysis.AlignmentAnnotationUtilsTest"/>
-      <class name="jalview.structure.StructureSelectionManagerTest"/>
-      <class name="jalview.io.TCoffeeScoreFileTest"/>
-      <class name="jalview.analysis.AAFrequencyTest"/>
-      <class name="jalview.ws.dbsources.PDBRestClientTest"/>
-      <class name="jalview.analysis.DnaTest"/>
-      <class name="jalview.util.StringUtilsTest"/>
-      <class name="jalview.structures.models.AAStructureBindingModelTest"/>
-      <class name="jalview.gui.JvSwingUtilsTest"/>
-      <class name="jalview.analysis.CodingUtilsTest"/>
-      <class name="jalview.io.AnnotatedPDBFileInputTest"/>
-      <class name="jalview.ws.rest.ShmmrRSBSService"/>
-      <class name="jalview.io.NewickFileTests"/>
-      <class name="jalview.analysis.ParsePropertiesTest"/>
-      <class name="MCview.BondTest"/>
-      <class name="jalview.commands.EditCommandTest"/>
-      <class name="jalview.ext.rbvi.chimera.JalviewChimeraView"/>
-      <class name="jalview.ws.jabaws.JpredJabaStructExportImport"/>
-      <class name="jalview.gui.HelpTest"/>
-      <class name="jalview.datamodel.AlignedCodonIteratorTest"/>
-      <class name="jalview.datamodel.xdb.embl.EmblFileTest"/>
-      <class name="jalview.util.ComparisonTest"/>
-      <class name="jalview.util.QuickSortTest"/>
-      <class name="jalview.ws.PDBSequenceFetcherTest"/>
-      <class name="jalview.analysis.scoremodels.FeatureScoreModelTest"/>
-      <class name="jalview.io.Jalview2xmlTests"/>
-      <class name="jalview.ws.rest.RestClientTest"/>
-      <class name="jalview.datamodel.AlignedCodonFrameTest"/>
-      <class name="jalview.datamodel.MappingTest"/>
-      <class name="jalview.datamodel.AlignmentTest"/>
-      <class name="jalview.ws.dbsources.UniprotTest"/>
-      <class name="jalview.gui.AnnotationChooserTest"/>
-      <class name="jalview.structure.Mapping"/>
-      <class name="jalview.datamodel.SequenceTest"/>
-      <class name="jalview.datamodel.PDBEntryTest"/>
-      <class name="jalview.gui.StructureChooserTest"/>
-      <class name="jalview.schemes.DnaCodonTests"/>
-      <class name="com.stevesoft.pat.RegexWriterTest"/>
-      <class name="jalview.datamodel.DBRefEntryTest"/>
-      <class name="jalview.gui.FontChooserTest"/>
-      <class name="jalview.analysis.TestAlignSeq"/>
-      <class name="jalview.datamodel.SeqCigarTest"/>
-      <class name="jalview.gui.JAL1353bugdemo"/>
-      <class name="jalview.datamodel.AlignmentViewTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- Suite --> 
-- 
1.7.10.2