rhbz1139950 - apply file mapping rule to properties push strategy

zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java

@@ -52,6 +52,10 @@ public class TransFileResolver {
                             "{path}/{locale_with_underscore}.po"))
                     .put(ProjectType.Podir, new FileMappingRule(
                             "{locale}/{path}/{filename}.po"))
+                    .put(ProjectType.Properties, new FileMappingRule(
+                            "{path}/{filename}_{locale_with_underscore}.{extension}"))
+                    .put(ProjectType.Utf8Properties, new FileMappingRule(
+                            "{path}/{filename}_{locale_with_underscore}.{extension}"))
                     .build();
 
     public TransFileResolver(ConfigurableProjectOptions opts) {

zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java

@@ -30,6 +30,7 @@
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.io.FilenameUtils;
 import org.zanata.adapter.properties.PropReader;
+import org.zanata.client.commands.TransFileResolver;
 import org.zanata.client.commands.push.PushCommand.TranslationResourcesVisitor;
 import org.zanata.client.config.LocaleMapping;
 import org.zanata.common.ContentState;
@@ -126,8 +127,9 @@ public void visitTranslationResources(String docName, Resource srcDoc,
             TranslationResourcesVisitor callback) throws IOException,
             RuntimeException {
         for (LocaleMapping locale : getOpts().getLocaleMapList()) {
-            String filename = docNameToFilename(docName, locale);
-            File transFile = new File(getOpts().getTransDir(), filename);
+            File transFile = new TransFileResolver(getOpts()).getTransFile(
+                    TransFileResolver.UnqualifiedSrcDocName.from(docName),
+                    locale);
             if (transFile.exists()) {
                 TranslationsResource targetDoc =
                         loadTranslationsResource(srcDoc, transFile);

zanata-client-commands/src/test/java/org/zanata/client/TempTransFileRule.java

@@ -21,11 +21,16 @@
 
 package org.zanata.client;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 import org.junit.rules.TemporaryFolder;
 
+import com.google.common.io.Files;
+
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
@@ -47,11 +52,20 @@ protected void before() throws Throwable {
     public File createTransFileRelativeToTransDir(String path)
             throws IOException {
         File file = new File(transDir, path);
-        assertThat(file.getParentFile().mkdirs(), is(true));
+        File parentFile = file.getParentFile();
+        parentFile.mkdirs();
+        assertThat(parentFile.exists(), is(true));
         assertThat(file.createNewFile(), is(true));
         return file;
     }
 
+    public void addContentToFile(File file, Charset charset, String content)
+            throws Exception {
+        BufferedWriter writer = Files.newWriter(file, charset);
+        writer.write(content);
+        writer.close();
+    }
+
     public File getTransDir() {
         return transDir;
     }

zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesStrategyTest.java

@@ -0,0 +1,164 @@
+/*
+ * Copyright 2014, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.zanata.client.commands.push;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.zanata.client.TempTransFileRule;
+import org.zanata.client.config.FileMappingRule;
+import org.zanata.client.config.LocaleList;
+import org.zanata.client.config.LocaleMapping;
+import org.zanata.common.LocaleId;
+import org.zanata.rest.dto.resource.Resource;
+import org.zanata.rest.dto.resource.TextFlow;
+import org.zanata.rest.dto.resource.TranslationsResource;
+import com.google.common.base.Charsets;
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import com.google.common.io.Files;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.zanata.client.TestUtils.createAndAddLocaleMapping;
+
+public class PropertiesStrategyTest {
+
+    @Rule
+    public TempTransFileRule tempFileRule = new TempTransFileRule();
+    private PropertiesStrategy strategy;
+    private PushOptionsImpl opts;
+    @Captor
+    private ArgumentCaptor<TranslationsResource> transResourceCaptor;
+    @Mock
+    private PushCommand.TranslationResourcesVisitor visitor;
+    private Resource sourceResource;
+
+    @Before
+    public void setUp() throws IOException {
+        MockitoAnnotations.initMocks(this);
+        strategy = new PropertiesStrategy();
+        opts = new PushOptionsImpl();
+        opts.setLocaleMapList(new LocaleList());
+        opts.setTransDir(tempFileRule.getTransDir());
+        opts.setSourceLang(LocaleId.EN_US.getId());
+        opts.setProjectType("properties");
+        strategy.setPushOptions(opts);
+
+        sourceResource = new Resource("test");
+        sourceResource.getTextFlows().add(
+                new TextFlow("hello", LocaleId.EN_US, "world"));
+        strategy.init();
+    }
+
+    @Test
+    public void canVisitTranslationFileWithoutFileMapping() throws Exception {
+        // with translation
+        LocaleMapping deMapping = createAndAddLocaleMapping("de",
+                Optional.<String> absent(), opts);
+        // with translation and has map-from
+        LocaleMapping zhMapping =
+                createAndAddLocaleMapping("zh-CN",
+                        Optional.of("zh-Hans"),
+                        opts);
+        // no translation
+        opts.getLocaleMapList().add(new LocaleMapping("ja"));
+
+        File deTransFile =
+                tempFileRule.createTransFileRelativeToTransDir(
+                        "src/main/resources/test_de.properties");
+        tempFileRule.addContentToFile(deTransFile, Charsets.ISO_8859_1,
+                "hello=de");
+        File zhTransFile =
+                tempFileRule.createTransFileRelativeToTransDir(
+                        "src/main/resources/test_zh_Hans.properties");
+        tempFileRule.addContentToFile(zhTransFile, Charsets.ISO_8859_1,
+                "hello=zh");
+
+        strategy.visitTranslationResources("src/main/resources/test",
+                sourceResource, visitor);
+
+        verify(visitor).visit(eq(deMapping), transResourceCaptor.capture());
+        assertThat(transResourceCaptor.getValue().getTextFlowTargets(),
+                hasSize(1));
+
+        verify(visitor).visit(eq(zhMapping), transResourceCaptor.capture());
+        assertThat(transResourceCaptor.getValue().getTextFlowTargets(),
+                hasSize(1));
+
+        verifyNoMoreInteractions(visitor);
+    }
+
+    @Test
+    public void canVisitTranslationFileUsingFileMapping() throws Exception {
+        // with translation
+        LocaleMapping deMapping = createAndAddLocaleMapping("de",
+                Optional.<String> absent(), opts);
+        // with translation and has map-from
+        LocaleMapping zhMapping =
+                createAndAddLocaleMapping("zh-CN",
+                        Optional.of("zh-Hans"),
+                        opts);
+        // no translation
+        opts.getLocaleMapList().add(new LocaleMapping("ja"));
+
+        File deTransFile =
+                tempFileRule.createTransFileRelativeToTransDir(
+                        "src/main/resources/test_de.properties");
+        tempFileRule.addContentToFile(deTransFile, Charsets.ISO_8859_1,
+                "hello=de");
+        File zhTransFile =
+                tempFileRule.createTransFileRelativeToTransDir(
+                        "src/main/resources/test_zh_Hans.properties");
+        tempFileRule.addContentToFile(zhTransFile, Charsets.ISO_8859_1,
+                "hello=zh");
+
+        opts.setFileMappingRules(Lists
+                .newArrayList(
+                new FileMappingRule("**/*.properties",
+                        "{path}/{filename}_{locale_with_underscore}.{extension}")));
+
+        strategy.visitTranslationResources("src/main/resources/test",
+                sourceResource, visitor);
+
+        verify(visitor).visit(eq(deMapping), transResourceCaptor.capture());
+        assertThat(transResourceCaptor.getValue().getTextFlowTargets(),
+                hasSize(1));
+
+        verify(visitor).visit(eq(zhMapping), transResourceCaptor.capture());
+        assertThat(transResourceCaptor.getValue().getTextFlowTargets(),
+                hasSize(1));
+
+        verifyNoMoreInteractions(visitor);
+    }
+
+}