From d6276824b53fcdadd7c6505eb378d581e61e059d Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 03:08:22 +0530
Subject: [PATCH 1/8] This closes #863 Same xmlsuite is added multiple times
 when tests are run using TestNG.SetXmlSuites method

---
 src/main/java/org/testng/TestNG.java          | 39 +++++++++++--------
 .../test/sanitycheck/CheckSuiteNamesTest.java | 33 +++++++++++++++-
 .../java/test/sanitycheck/SuiteListner.java   | 28 +++++++++++++
 3 files changed, 81 insertions(+), 19 deletions(-)
 create mode 100644 src/test/java/test/sanitycheck/SuiteListner.java

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index d40c9803e8..11e5200c55 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -71,7 +71,7 @@
 /**
  * This class is the main entry point for running tests in the TestNG framework.
  * Users can create their own TestNG object and invoke it in many different
- * ways:
+ * ways
  * <ul>
  * <li>On an existing testng.xml
  * <li>On a synthetic testng.xml, created entirely from Java
@@ -269,6 +269,7 @@ public void setXmlPathInJar(String xmlPathInJar) {
   public void initializeSuitesAndJarFile() {
     // The Eclipse plug-in (RemoteTestNG) might have invoked this method already
     // so don't initialize suites twice.
+	System.out.println("ENTER");
     if (m_isInitialized) {
       return;
     }
@@ -277,20 +278,24 @@ public void initializeSuitesAndJarFile() {
     if (m_suites.size() > 0) {
     	//to parse the suite files (<suite-file>), if any
     	for (XmlSuite s: m_suites) {
-        for (String suiteFile : s.getSuiteFiles()) {
-            Path rootPath = Paths.get(s.getFileName()).getParent();
-            try {
-                Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
-                for (XmlSuite cSuite : childSuites){
-                    cSuite.setParentSuite(s);
-                    s.getChildSuites().add(cSuite);
-                }
-            } catch (ParserConfigurationException | IOException | SAXException e) {
-                e.printStackTrace(System.out);
-            }
-        }
-
-    	}
+	        for (String suiteFile : s.getSuiteFiles()) {
+		            Path suitePath = Paths.get(s.getFileName());
+		            Path rootPath = suitePath.getParent();
+		            try {
+		                Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
+		                for (XmlSuite cSuite : childSuites){
+		                	Path childSuite = Paths.get(cSuite.getFileName()).normalize();
+		                	Path parentSuite = Paths.get(suiteFile).normalize();
+		                	if(!childSuite.getFileName().equals(parentSuite.getFileName()))
+		                	{
+		                		cSuite.setParentSuite(s);
+		                		s.getChildSuites().add(cSuite);
+		                	}
+		                }
+		            } catch (ParserConfigurationException | IOException | SAXException e) {
+		                e.printStackTrace(System.out);
+		            }
+		        }
       return;
     }
 
@@ -1012,13 +1017,13 @@ private void checkSuiteNames(List<XmlSuite> suites) {
   private void checkSuiteNamesInternal(List<XmlSuite> suites, Set<String> names) {
     for (XmlSuite suite : suites) {
       final String name = suite.getName();
-
+   
       int count = 0;
       String tmpName = name;
       while (names.contains(tmpName)) {
         tmpName = name + " (" + count++ + ")";
       }
-
+      
       if (count > 0) {
         suite.setName(tmpName);
         names.add(tmpName);
diff --git a/src/test/java/test/sanitycheck/CheckSuiteNamesTest.java b/src/test/java/test/sanitycheck/CheckSuiteNamesTest.java
index b2a4443f69..269184a6db 100644
--- a/src/test/java/test/sanitycheck/CheckSuiteNamesTest.java
+++ b/src/test/java/test/sanitycheck/CheckSuiteNamesTest.java
@@ -9,9 +9,16 @@
 import org.testng.xml.XmlSuite;
 import org.testng.xml.XmlTest;
 import org.xml.sax.SAXException;
+
 import test.SimpleBaseTest;
+
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import javax.xml.parsers.ParserConfigurationException;
 
 public class CheckSuiteNamesTest extends SimpleBaseTest {
@@ -73,12 +80,34 @@ public void checkProgrammaticSuitesFails() {
     Assert.assertEquals(xmlSuite2.getName(), "SanityCheckSuite (0)");
   }
   
- @Test
- public void checkXmlSuiteAddition() throws ParserConfigurationException, SAXException, IOException {
+  @Test
+  public void checkXmlSuiteAddition() throws ParserConfigurationException, SAXException, IOException {
     TestNG tng = create();
     String testngXmlPath = getPathToResource("sanitycheck/test-s-b.xml");
     Parser parser = new Parser(testngXmlPath);	
     tng.setXmlSuites(parser.parseToList());
     tng.initializeSuitesAndJarFile();		
   }
+  
+  @Test(description = "Verify that same suite is not added multiple times")
+  public void validateDuplicateSuiteAddition() throws ParserConfigurationException, SAXException, IOException
+  {
+	SuiteListner suiteListner = new SuiteListner();
+	TestNG tng = create();
+	String testngXmlPath = getPathToResource("sanitycheck/test-s-b.xml");
+	Parser parser = new Parser(testngXmlPath);
+	tng.setXmlSuites(parser.parseToList());
+	tng.addListener(suiteListner);
+	tng.run();
+	
+    Set<String> allSuite = new HashSet<String>();
+    List<XmlSuite> ranSuites = suiteListner.getAllTestSuite();
+    
+    Assert.assertEquals(ranSuites.size(), 3, "Correct number of suites ran");
+    for(XmlSuite suite : ranSuites)
+    {
+    	Assert.assertTrue(allSuite.add(suite.getFileName()), 
+    			String.format("No duplicate of suite %s added", suite.getFileName()));
+    }
+  }
 }
diff --git a/src/test/java/test/sanitycheck/SuiteListner.java b/src/test/java/test/sanitycheck/SuiteListner.java
new file mode 100644
index 0000000000..b7a22d54b9
--- /dev/null
+++ b/src/test/java/test/sanitycheck/SuiteListner.java
@@ -0,0 +1,28 @@
+package test.sanitycheck;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.testng.ISuite;
+import org.testng.ISuiteListener;
+import org.testng.xml.XmlSuite;
+
+public class SuiteListner implements ISuiteListener {
+
+	List<XmlSuite> allSuite = new ArrayList<XmlSuite>();
+	
+	@Override
+	public void onStart(ISuite suite) {
+		allSuite.add(suite.getXmlSuite());	
+	}
+
+	@Override
+	public void onFinish(ISuite suite) {
+		
+	}
+	
+	public List<XmlSuite> getAllTestSuite(){
+		return allSuite;
+	}
+
+}

From 18f523bb2fd8d89702cb09660bd8f9e6a3997028 Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 03:10:46 +0530
Subject: [PATCH 2/8] This closes #863 Same xmlsuite is added multiple times
 when tests are run using TestNG.SetXmlSuites method

---
 src/main/java/org/testng/TestNG.java | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 11e5200c55..2cb5992f64 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -276,26 +276,26 @@ public void initializeSuitesAndJarFile() {
 
     m_isInitialized = true;
     if (m_suites.size() > 0) {
-    	//to parse the suite files (<suite-file>), if any
-    	for (XmlSuite s: m_suites) {
-	        for (String suiteFile : s.getSuiteFiles()) {
-		            Path suitePath = Paths.get(s.getFileName());
-		            Path rootPath = suitePath.getParent();
-		            try {
-		                Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
-		                for (XmlSuite cSuite : childSuites){
-		                	Path childSuite = Paths.get(cSuite.getFileName()).normalize();
-		                	Path parentSuite = Paths.get(suiteFile).normalize();
-		                	if(!childSuite.getFileName().equals(parentSuite.getFileName()))
-		                	{
-		                		cSuite.setParentSuite(s);
-		                		s.getChildSuites().add(cSuite);
-		                	}
-		                }
-		            } catch (ParserConfigurationException | IOException | SAXException e) {
-		                e.printStackTrace(System.out);
-		            }
-		        }
+    //to parse the suite files (<suite-file>), if any
+	for (XmlSuite s: m_suites) {
+        for (String suiteFile : s.getSuiteFiles()) {
+	            Path suitePath = Paths.get(s.getFileName());
+	            Path rootPath = suitePath.getParent();
+	            try {
+	                Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
+	                for (XmlSuite cSuite : childSuites){
+	                	Path childSuite = Paths.get(cSuite.getFileName()).normalize();
+	                	Path parentSuite = Paths.get(suiteFile).normalize();
+	                	if(!childSuite.getFileName().equals(parentSuite.getFileName()))
+	                	{
+	                		cSuite.setParentSuite(s);
+	                		s.getChildSuites().add(cSuite);
+	                	}
+	                }
+	            } catch (ParserConfigurationException | IOException | SAXException e) {
+	                e.printStackTrace(System.out);
+	            }
+	        }
       return;
     }
 

From 5e010aa34bfd5d39f56d0882bd3d7f3d9b53c29f Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 03:19:59 +0530
Subject: [PATCH 3/8] Update

---
 src/main/java/org/testng/TestNG.java | 38 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 2cb5992f64..d493389157 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -278,24 +278,24 @@ public void initializeSuitesAndJarFile() {
     if (m_suites.size() > 0) {
     //to parse the suite files (<suite-file>), if any
 	for (XmlSuite s: m_suites) {
-        for (String suiteFile : s.getSuiteFiles()) {
-	            Path suitePath = Paths.get(s.getFileName());
-	            Path rootPath = suitePath.getParent();
-	            try {
-	                Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
-	                for (XmlSuite cSuite : childSuites){
-	                	Path childSuite = Paths.get(cSuite.getFileName()).normalize();
-	                	Path parentSuite = Paths.get(suiteFile).normalize();
-	                	if(!childSuite.getFileName().equals(parentSuite.getFileName()))
-	                	{
-	                		cSuite.setParentSuite(s);
-	                		s.getChildSuites().add(cSuite);
-	                	}
-	                }
-	            } catch (ParserConfigurationException | IOException | SAXException e) {
-	                e.printStackTrace(System.out);
-	            }
-	        }
+		for (String suiteFile : s.getSuiteFiles()) {
+        	Path suitePath = Paths.get(s.getFileName());
+        	Path rootPath = suitePath.getParent();
+        	try {
+        		Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
+        		for (XmlSuite cSuite : childSuites){
+        			Path childSuite = Paths.get(cSuite.getFileName()).normalize();
+        			Path parentSuite = Paths.get(suiteFile).normalize();
+        			if(!childSuite.getFileName().equals(parentSuite.getFileName()))
+        			{
+        				cSuite.setParentSuite(s);
+        				s.getChildSuites().add(cSuite);
+        			}
+        		}
+            } catch (ParserConfigurationException | IOException | SAXException e) {
+                e.printStackTrace(System.out);
+            }
+	      }
       return;
     }
 
@@ -1017,8 +1017,8 @@ private void checkSuiteNames(List<XmlSuite> suites) {
   private void checkSuiteNamesInternal(List<XmlSuite> suites, Set<String> names) {
     for (XmlSuite suite : suites) {
       final String name = suite.getName();
-   
       int count = 0;
+      
       String tmpName = name;
       while (names.contains(tmpName)) {
         tmpName = name + " (" + count++ + ")";

From cc5b52313067d41cdf42e2073e8addfd0ea84e96 Mon Sep 17 00:00:00 2001
From: Virender Singh <virenv@outlook.com>
Date: Thu, 26 Nov 2015 03:23:43 +0530
Subject: [PATCH 4/8] Update TestNG.java

---
 src/main/java/org/testng/TestNG.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index d493389157..3c6ce58e7e 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -278,7 +278,7 @@ public void initializeSuitesAndJarFile() {
     if (m_suites.size() > 0) {
     //to parse the suite files (<suite-file>), if any
 	for (XmlSuite s: m_suites) {
-		for (String suiteFile : s.getSuiteFiles()) {
+	   for (String suiteFile : s.getSuiteFiles()) {
         	Path suitePath = Paths.get(s.getFileName());
         	Path rootPath = suitePath.getParent();
         	try {

From d3712b150d937aefee50d95f0bc425fe5255dfea Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 03:33:17 +0530
Subject: [PATCH 5/8] Build faliure fix

---
 src/main/java/org/testng/TestNG.java | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index d493389157..a33e6b3923 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -269,34 +269,34 @@ public void setXmlPathInJar(String xmlPathInJar) {
   public void initializeSuitesAndJarFile() {
     // The Eclipse plug-in (RemoteTestNG) might have invoked this method already
     // so don't initialize suites twice.
-	System.out.println("ENTER");
     if (m_isInitialized) {
       return;
     }
 
     m_isInitialized = true;
     if (m_suites.size() > 0) {
-    //to parse the suite files (<suite-file>), if any
-	for (XmlSuite s: m_suites) {
-		for (String suiteFile : s.getSuiteFiles()) {
-        	Path suitePath = Paths.get(s.getFileName());
-        	Path rootPath = suitePath.getParent();
-        	try {
-        		Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
-        		for (XmlSuite cSuite : childSuites){
-        			Path childSuite = Paths.get(cSuite.getFileName()).normalize();
-        			Path parentSuite = Paths.get(suiteFile).normalize();
-        			if(!childSuite.getFileName().equals(parentSuite.getFileName()))
-        			{
-        				cSuite.setParentSuite(s);
-        				s.getChildSuites().add(cSuite);
-        			}
-        		}
-            } catch (ParserConfigurationException | IOException | SAXException e) {
-                e.printStackTrace(System.out);
-            }
-	      }
-      return;
+        //to parse the suite files (<suite-file>), if any
+		for (XmlSuite s: m_suites) {
+	       for (String suiteFile : s.getSuiteFiles()) {
+	        	Path suitePath = Paths.get(s.getFileName());
+	        	Path rootPath = suitePath.getParent();
+	        	try {
+	        		Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
+	        		for (XmlSuite cSuite : childSuites){
+	        			Path childSuite = Paths.get(cSuite.getFileName()).normalize();
+	        			Path parentSuite = Paths.get(suiteFile).normalize();
+	        			if(!childSuite.getFileName().equals(parentSuite.getFileName()))
+	        			{
+	        				cSuite.setParentSuite(s);
+	        				s.getChildSuites().add(cSuite);
+	        			}
+	        		}
+	            } catch (ParserConfigurationException | IOException | SAXException e) {
+	                e.printStackTrace(System.out);
+	            }
+		      }
+	      return;
+	    }
     }
 
     //

From 725e88844c4a961e22191cfcab629a1f93e18336 Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 03:57:29 +0530
Subject: [PATCH 6/8] Review comment update

---
 src/main/java/org/testng/TestNG.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 04bd8df430..fe087eab08 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -277,11 +277,10 @@ public void initializeSuitesAndJarFile() {
     if (m_suites.size() > 0) {
 	    //to parse the suite files (<suite-file>), if any
 		for (XmlSuite s: m_suites) {
+		   Path suitePath = Paths.get(s.getFileName()).getParent();
 		   for (String suiteFile : s.getSuiteFiles()) {
-	        	Path suitePath = Paths.get(s.getFileName());
-	        	Path rootPath = suitePath.getParent();
 	        	try {
-	        		Collection<XmlSuite> childSuites = getParser(rootPath.resolve(suiteFile).normalize().toString()).parse();
+	        		Collection<XmlSuite> childSuites = getParser(suitePath.resolve(suiteFile).normalize().toString()).parse();
 	        		for (XmlSuite cSuite : childSuites){
 	        			Path childSuite = Paths.get(cSuite.getFileName()).normalize();
 	        			Path parentSuite = Paths.get(suiteFile).normalize();

From 33e5c5594c7abac4a5fb20636db1900ee027569d Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Thu, 26 Nov 2015 23:57:20 +0530
Subject: [PATCH 7/8] Fixing build faliure

---
 src/main/java/org/testng/TestNG.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index fe087eab08..c5ed96eb3b 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -277,8 +277,8 @@ public void initializeSuitesAndJarFile() {
     if (m_suites.size() > 0) {
 	    //to parse the suite files (<suite-file>), if any
 		for (XmlSuite s: m_suites) {
-		   Path suitePath = Paths.get(s.getFileName()).getParent();
 		   for (String suiteFile : s.getSuiteFiles()) {
+			   Path suitePath = Paths.get(s.getFileName()).getParent();
 	        	try {
 	        		Collection<XmlSuite> childSuites = getParser(suitePath.resolve(suiteFile).normalize().toString()).parse();
 	        		for (XmlSuite cSuite : childSuites){

From 183b26e6c320412cf14818c3fbcb44ebd2bb3fe8 Mon Sep 17 00:00:00 2001
From: toolsqa <toolsqa@gmail.com>
Date: Fri, 27 Nov 2015 00:17:04 +0530
Subject: [PATCH 8/8] adding review comment

---
 src/test/java/test/sanitycheck/SuiteListner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/test/sanitycheck/SuiteListner.java b/src/test/java/test/sanitycheck/SuiteListner.java
index b7a22d54b9..acb4da4933 100644
--- a/src/test/java/test/sanitycheck/SuiteListner.java
+++ b/src/test/java/test/sanitycheck/SuiteListner.java
@@ -9,7 +9,7 @@
 
 public class SuiteListner implements ISuiteListener {
 
-	List<XmlSuite> allSuite = new ArrayList<XmlSuite>();
+	private List<XmlSuite> allSuite = new ArrayList<XmlSuite>();
 	
 	@Override
 	public void onStart(ISuite suite) {