Fixing maven integraion test issues

- When MT configuraton for English is not available, returns empty target language set, instead of null - download-basic test to specify target languages explicitly instead of default MT languages that can be changed depending on GP deployments.
IBM-Cloud · Aug 26, 2019 · 0aa5ce0 · 0aa5ce0
1 parent e8118b2
commit 0aa5ce0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/gp-maven-plugin/src/it/download-basic/pom.xml b/gp-maven-plugin/src/it/download-basic/pom.xml
@@ -34,6 +34,11 @@
 								</includes>
 							</sourceFiles>
 							<type>JSON</type>
+							<sourceLanguage>en</sourceLanguage>
+							<targetLanguages>
+								<param>de</param>
+								<param>fr</param>
+							</targetLanguages>
 						</bundleSet>
 					</bundleSets>
 				</configuration>

diff --git a/gp-maven-plugin/src/it/download-basic/verify.groovy b/gp-maven-plugin/src/it/download-basic/verify.groovy
@@ -36,7 +36,7 @@ try {
             }
         }
     }
-    assert filecount == 20
+    assert filecount == 6
 
     def dir2 = new File(targetLocation2)
     dir2.traverse { file ->

diff --git a/gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPBaseMojo.java b/gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPBaseMojo.java
@@ -263,10 +263,13 @@ protected Set<String> resolveTargetLanguages(BundleSet bundleSet) throws MojoFai
                 Map<String, Set<String>> activeMTLangs = client.getConfiguredMTLanguages();
                 targetLanguages = activeMTLangs.get(srcLang);
             } catch (ServiceException e) {
-                targetLanguages = Collections.emptySet();
                 throw new MojoFailureException("Globalization Pipeline service error", e);
             }
 
+            if (targetLanguages == null) {
+                targetLanguages = Collections.emptySet();
+            }
+
             getLog().info("The configuration parameter 'targetLanguages' is not specified."
                     + " Using currently active target languages: " + targetLanguages);
         }