[JENKINS-14954] Added note about requirement to have the include patt…

…erns relative to the job workspace. Also fixed the log messages for result seeking strategies.
jenkinsci · Sep 19, 2012 · 2c5ea35 · 2c5ea35
1 parent 82cfc78
commit 2c5ea35
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 28 deletions.
diff --git a/src/main/java/hudson/plugins/testlink/result/JUnitCaseNameResultSeeker.java b/src/main/java/hudson/plugins/testlink/result/JUnitCaseNameResultSeeker.java
@@ -82,7 +82,7 @@ public String getDisplayName() {
 	 */
 	@Override
 	public void seek(TestCaseWrapper[] automatedTestCases, AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener, TestLinkSite testlink) throws ResultSeekerException {
-		listener.getLogger().println( Messages.Results_JUnit_LookingForTestClasses() ); // i18n
+		listener.getLogger().println( Messages.Results_JUnit_LookingForTestCases() ); // i18n
 		try {
 			final JUnitParser parser = new JUnitParser(false);
 			final TestResult testResult = parser.parse(this.includePattern, build, launcher, listener);

diff --git a/src/main/java/hudson/plugins/testlink/result/JUnitMethodNameResultSeeker.java b/src/main/java/hudson/plugins/testlink/result/JUnitMethodNameResultSeeker.java
@@ -83,7 +83,7 @@ public String getDisplayName() {
 	 */
 	@Override
 	public void seek(TestCaseWrapper[] automatedTestCases, AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener, TestLinkSite testlink) throws ResultSeekerException {
-		listener.getLogger().println( Messages.Results_JUnit_LookingForTestClasses() ); // i18n
+		listener.getLogger().println( Messages.Results_JUnit_LookingForTestMethods() ); // i18n
 		try {
 			final JUnitParser parser = new JUnitParser(false);
 			final TestResult testResult = parser.parse(this.includePattern, build, launcher, listener);

diff --git a/...ain/java/hudson/plugins/testlink/result/TestNGMethodNameDataProviderNameResultSeeker.java b/...ain/java/hudson/plugins/testlink/result/TestNGMethodNameDataProviderNameResultSeeker.java
@@ -107,7 +107,7 @@ public String getDisplayName() {
 	 */
 	@Override
 	public void seek(TestCaseWrapper[] automatedTestCases, AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener, TestLinkSite testlink) throws ResultSeekerException {
-		listener.getLogger().println( Messages.Results_TestNG_LookingForTestSuites() );
+		listener.getLogger().println( Messages.Results_TestNG_LookingForTestMethodDataProvider() );
 		try {
 			final List<Suite> suites = build.getWorkspace().act(new FilePath.FileCallable<List<Suite>>() {
 				private static final long serialVersionUID = 1L;

diff --git a/src/main/java/hudson/plugins/testlink/result/TestNGMethodNameResultSeeker.java b/src/main/java/hudson/plugins/testlink/result/TestNGMethodNameResultSeeker.java
@@ -90,7 +90,7 @@ public String getDisplayName() {
 	 */
 	@Override
 	public void seek(TestCaseWrapper[] automatedTestCases, AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener, TestLinkSite testlink) throws ResultSeekerException {
-		listener.getLogger().println( Messages.Results_TestNG_LookingForTestSuites() );
+		listener.getLogger().println( Messages.Results_TestNG_LookingForTestMethod() );
 		try {
 			final List<Suite> suites = build.getWorkspace().act(new FilePath.FileCallable<List<Suite>>() {
 				private static final long serialVersionUID = 1L;

diff --git a/src/main/resources/hudson/plugins/testlink/util/Messages.properties b/src/main/resources/hudson/plugins/testlink/util/Messages.properties
@@ -19,8 +19,10 @@ TestLinkBuilder.MandatoryProperty=This property is mandatory.
 
 Results.LookingForTestResults=Looking for the test results of TestLink test cases.\n
 Results.ErrorToLookForTestResults=An error occured while trying to retrieve the test results: {0}
-Results.JUnit.LookingForTestClasses=Looking for test results in JUnit classes.\n
-Results.JUnit.LookingForTestSuites=Looking for test results in JUnit suites.\n
+Results.JUnit.LookingForTestClasses=Looking for test results in JUnit classes by its name.\n
+Results.JUnit.LookingForTestSuites=Looking for test results in JUnit suites by its name.\n
+Results.JUnit.LookingForTestCases=Looking for test results in JUnit test cases by its name.\n
+Results.JUnit.LookingForTestMethods=Looking for test results in JUnit methods by its name.\n
 Results.JUnit.NoPattern=Empty JUnit include pattern. Skipping JUnit test results.\n
 Results.JUnit.NumberOfReportsFound=Found [{0}] JUnit XML(s).\n
 Results.JUnit.IOException=IO error scanning for include pattern [{0}]: {1}.
@@ -36,8 +38,10 @@ Results.TAP.NumberOfReportsFound=Found [{0}] TAP file(s).\n
 Results.TAP.IOException=IO error scanning for include pattern [{0}]: {1}.
 Results.TAP.UnkownInternalError=Unkown internal error. Please, open an issue in Jenkins JIRA with the complete stack trace. If possible, try including the TAP file(s) too.
 Results.TAP.AddAttachmentsFail=\n\nFailed to add TAP attachments to this test case execution. Error message: {0}.
-Results.TestNG.LookingForTestClasses=Looking for test results in TestNG classes.\n
-Results.TestNG.LookingForTestSuites=Looking for test results in TestNG suites.\n
+Results.TestNG.LookingForTestClasses=Looking for test results in TestNG classes by its name.\n
+Results.TestNG.LookingForTestSuites=Looking for test results in TestNG suites by its name.\n
+Results.TestNG.LookingForTestMethod=Looking for test results in TestNG methods by its name.\n
+Results.TestNG.LookingForTestMethodDataProvider=Looking for test results in TestNG methods by its name and data provider name.\n
 Results.TestNG.NoPattern=Empty TestNG include pattern. Skipping TestNG test results.\n
 Results.TestNG.NumberOfReportsFound=Found [{0}] TestNG XML(s).\n
 Results.TestNG.IOException=IO error scanning for include pattern [{0}]: {1}.

diff --git a/src/main/resources/hudson/plugins/testlink/util/Messages_en.properties b/src/main/resources/hudson/plugins/testlink/util/Messages_en.properties
@@ -19,8 +19,10 @@ TestLinkBuilder.MandatoryProperty=This property is mandatory.
 
 Results.LookingForTestResults=Looking for the test results of TestLink test cases.\n
 Results.ErrorToLookForTestResults=An error occured while trying to retrieve the test results: {0}
-Results.JUnit.LookingForTestClasses=Looking for test results in JUnit classes.\n
-Results.JUnit.LookingForTestSuites=Looking for test results in JUnit suites.\n
+Results.JUnit.LookingForTestClasses=Looking for test results in JUnit classes by its name.\n
+Results.JUnit.LookingForTestSuites=Looking for test results in JUnit suites by its name.\n
+Results.JUnit.LookingForTestCases=Looking for test results in JUnit test cases by its name.\n
+Results.JUnit.LookingForTestMethods=Looking for test results in JUnit methods by its name.\n
 Results.JUnit.NoPattern=Empty JUnit include pattern. Skipping JUnit test results.\n
 Results.JUnit.NumberOfReportsFound=Found [{0}] JUnit XML(s).\n
 Results.JUnit.IOException=IO error scanning for include pattern [{0}]: {1}.
@@ -36,8 +38,10 @@ Results.TAP.NumberOfReportsFound=Found [{0}] TAP file(s).\n
 Results.TAP.IOException=IO error scanning for include pattern [{0}]: {1}.
 Results.TAP.UnkownInternalError=Unkown internal error. Please, open an issue in Jenkins JIRA with the complete stack trace. If possible, try including the TAP file(s) too.
 Results.TAP.AddAttachmentsFail=\n\nFailed to add TAP attachments to this test case execution. Error message: {0}.
-Results.TestNG.LookingForTestClasses=Looking for test results in TestNG classes.\n
-Results.TestNG.LookingForTestSuites=Looking for test results in TestNG suites.\n
+Results.TestNG.LookingForTestClasses=Looking for test results in TestNG classes by its name.\n
+Results.TestNG.LookingForTestSuites=Looking for test results in TestNG suites by its name.\n
+Results.TestNG.LookingForTestMethod=Looking for test results in TestNG methods by its name.\n
+Results.TestNG.LookingForTestMethodDataProvider=Looking for test results in TestNG methods by its name and data provider name.\n
 Results.TestNG.NoPattern=Empty TestNG include pattern. Skipping TestNG test results.\n
 Results.TestNG.NumberOfReportsFound=Found [{0}] TestNG XML(s).\n
 Results.TestNG.IOException=IO error scanning for include pattern [{0}]: {1}.

diff --git a/src/main/resources/hudson/plugins/testlink/util/Messages_pt.properties b/src/main/resources/hudson/plugins/testlink/util/Messages_pt.properties
@@ -19,8 +19,10 @@ TestLinkBuilder.MandatoryProperty=Esta propriedade \uFFFD obrigat\uFFFDria.
 
 Results.LookingForTestResults=Procurando por resultados de casos de teste.\n
 Results.ErrorToLookForTestResults=Ocorreu um erro enquanto tentava recuperar os resultados de teste: {0}
-Results.JUnit.LookingForTestClasses=Procurando por resultados de teste em classes JUnit.\n
-Results.JUnit.LookingForTestSuites=Procurando por resultados de teste em suites JUnit.\n
+Results.JUnit.LookingForTestClasses=Procurando por resultados de teste em classes JUnit pelo nome.\n
+Results.JUnit.LookingForTestSuites=Procurando por resultados de teste em suites JUnit pelo nome.\n
+Results.JUnit.LookingForTestCases=Procurando por resultados de teste em casos de teste JUnit pelo nome.\n
+Results.JUnit.LookingForTestMethods=Procurando por resultados de teste em métodos JUnit pelo nome.\n
 Results.JUnit.NoPattern=Padr\uFFFDo de inclus\uFFFDo JUnit vazio. Pulando resultados de teste do JUnit.\n
 Results.JUnit.NumberOfReportsFound=Encontrou [{0}] XML(s) JUnit.\n
 Results.JUnit.IOException=Erro de IO buscando pelo padr\uFFFDo de inclus\uFFFDo [{0}]: {1}.
@@ -36,8 +38,10 @@ Results.TAP.NumberOfReportsFound=Encontrou [{0}] arquivo(s) TAP.\n
 Results.TAP.IOException=Erro de IO buscando pelo padr\uFFFDo de inclus\uFFFDo [{0}]: {1}.
 Results.TAP.UnkownInternalError=Erro interno desconhecido. Por favor, abra uma pend\uFFFDncia no JIRA do Jenkins com o stack trace complete. Se poss\uFFFDvel, tente incluir o(s) arquivo(s) TAP tamb\uFFFDm.
 Results.TAP.AddAttachmentsFail=\n\nFalha ao adicionar anexos TAP \uFFFD execu\uFFFD\uFFFDo do caso de teste. Mensagem de erro: {0}.
-Results.TestNG.LookingForTestClasses=Procurando por resultados de teste em classes TestNG.\n
-Results.TestNG.LookingForTestSuites=Procurando por resultados de teste em suites TestNG.\n
+Results.TestNG.LookingForTestClasses=Procurando por resultados de teste em classes TestNG pelo nome.\n
+Results.TestNG.LookingForTestSuites=Procurando por resultados de teste em suites TestNG pelo nome.\n
+Results.TestNG.LookingForTestMethod=Procurando por resultados de teste em métodos TestNG pelo nome.\n
+Results.TestNG.LookingForTestMethodDataProvider=Procurando por resultados de teste em métodos TestNG pelo nome e data provider.\n
 Results.TestNG.NoPattern=Padr\uFFFDo de inclus\uFFFDo TestNG vazio. Pulando resultados de teste do TestNG.\n
 Results.TestNG.NumberOfReportsFound=Encontrou [{0}] XML(s) TestNG.\n
 Results.TestNG.IOException=Erro de IO buscando pelo padr\uFFFDo de inclus\uFFFDo [{0}]: {1}.

diff --git a/src/main/webapp/help-junitIncludePattern.html b/src/main/webapp/help-junitIncludePattern.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Ant-like include pattern for JUnit report files (e.g.: **/TEST-*.xml).
+		Ant-like include pattern for JUnit report files (e.g.: **/TEST-*.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-junitIncludePattern_es.html b/src/main/webapp/help-junitIncludePattern_es.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Norma para encontrar informes JUnit (e.g.: **/TEST-*.xml).
+		Norma para encontrar informes JUnit (e.g.: **/TEST-*.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-junitIncludePattern_fr.html b/src/main/webapp/help-junitIncludePattern_fr.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Include pattern de type Ant, pour les fichiers de rapport JUnit (ex.: **/TEST-*.xml).
+		Include pattern de type Ant, pour les fichiers de rapport JUnit (ex.: **/TEST-*.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-junitIncludePattern_pt.html b/src/main/webapp/help-junitIncludePattern_pt.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Padr&#227;o para encontrar relat&#243;rios JUnit (e.g.: **/TEST-*.xml).
+		Padr&#227;o para encontrar relat&#243;rios JUnit (e.g.: **/TEST-*.xml). 
+		Deve ser relativo ao workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-tapIncludePattern.html b/src/main/webapp/help-tapIncludePattern.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Ant-like include pattern for TAP report files (e.g.: **/*.tap).
+		Ant-like include pattern for TAP report files (e.g.: **/*.tap). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-tapIncludePattern_es.html b/src/main/webapp/help-tapIncludePattern_es.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Norma para buscar los informes TAP (e.g.: **/*.tap).
+		Norma para buscar los informes TAP (e.g.: **/*.tap). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-tapIncludePattern_fr.html b/src/main/webapp/help-tapIncludePattern_fr.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Include pattern de type Ant, pour les fichiers de rapport TAP (ex.: **/*.tap).
+		Include pattern de type Ant, pour les fichiers de rapport TAP (ex.: **/*.tap). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-tapIncludePattern_pt.html b/src/main/webapp/help-tapIncludePattern_pt.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Padr&#227;o para encontrar relat&#243;rios TAP (e.g.: **/*.tap).
+		Padr&#227;o para encontrar relat&#243;rios TAP (e.g.: **/*.tap). 
+		Deve ser relativo ao workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-testNGIncludePattern.html b/src/main/webapp/help-testNGIncludePattern.html
@@ -1,6 +1,7 @@
 <div>
 	<p>
 		Ant-like include pattern for TestNG report files 
-		(e.g.: **/testng-results.xml).
+		(e.g.: **/testng-results.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-testNGIncludePattern_es.html b/src/main/webapp/help-testNGIncludePattern_es.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Norma para encontrar informes TestNG (e.g.: **/testng-results.xml).
+		Norma para encontrar informes TestNG (e.g.: **/testng-results.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-testNGIncludePattern_fr.html b/src/main/webapp/help-testNGIncludePattern_fr.html
@@ -1,6 +1,7 @@
 <div>
 	<p>
 		Include pattern de type Ant, pour les fichiers de rapport 
-		TestNG (ex.: **/testng-results.xml).
+		TestNG (ex.: **/testng-results.xml). 
+		Must be relative to workspace.
 	</p>
 </div>
diff --git a/src/main/webapp/help-testNGIncludePattern_pt.html b/src/main/webapp/help-testNGIncludePattern_pt.html
@@ -1,5 +1,6 @@
 <div>
 	<p>
-		Padr&#227;o para encontrar relat&#243;rios TestNG (e.g.: **/testng-results.xml).
+		Padr&#227;o para encontrar relat&#243;rios TestNG (e.g.: **/testng-results.xml). 
+		Deve ser relativo ao workspace.
 	</p>
 </div>