Merge pull request #16 from zanata/prevent-npe

Prevent NPE, set .gitattributes

.gitattributes

@@ -0,0 +1,44 @@
+# See https://help.github.com/articles/dealing-with-line-endings
+
+# This setting tells git to always normalize the files specified. 
+# When committed they are stored with LF, on checkout they are 
+# converted to the OS's native line endings.
+* text
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.c text
+*.css text
+*.csv text
+*.groovy text
+*.h text
+*.html text
+*.ini text
+*.java text
+*.js text
+*.launch text
+*.po text
+*.pot text
+*.properties text
+*.sh text
+*.sql text
+*.txt text
+*.xhtml text
+*.xml text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.gif binary
+*.jar binary
+*.jpg binary
+*.png binary
+*.idml binary
+*.odt binary
+*.odg binary
+*.odp binary
+*.ods binary
+*.ico binary
+*.eot binary
+*.ttf binary

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

@@ -15,6 +15,7 @@
 import org.jboss.resteasy.client.ClientResponse;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.zanata.client.commands.DummyResponse;
@@ -34,7 +35,7 @@
 import org.zanata.rest.dto.resource.TranslationsResource;
 
 public class PublicanPushCommandTest {
-    @Mock
+    @Mock(answer = Answers.RETURNS_MOCKS)
     ISourceDocResource mockSourceDocResource;
 
     @Mock