#305 fix config file checkoer

crowdin · Feb 2, 2023 · 473ad2f · 473ad2f
1 parent ad0fe68
commit 473ad2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ConfigurationFilesProperties.java b/src/main/java/com/crowdin/cli/commands/picocli/ConfigurationFilesProperties.java
@@ -22,8 +22,7 @@ public class ConfigurationFilesProperties {
     public File getConfigFile() {
         if (configFile == null) {
             configFile = this.getDefaultConfigFile();
-        }
-        else if (!configFile.exists()) {
+        } else if (!configFile.exists()) {
             throw new RuntimeException(RESOURCE_BUNDLE.getString("error.configuration_file_not_exist"));
         }
         return configFile;

diff --git a/src/main/java/com/crowdin/cli/properties/BaseProperties.java b/src/main/java/com/crowdin/cli/properties/BaseProperties.java
@@ -86,9 +86,11 @@ public void populateWithDefaultValues(BaseProperties props) {
         @Override
         public PropertiesBuilder.Messages checkProperties(@NonNull BaseProperties props, CheckType checkType) {
             PropertiesBuilder.Messages messages = new PropertiesBuilder.Messages();
-            String confFilePath = props.getConfigFilePath();
-            if (confFilePath == null || !(new File(confFilePath).exists())) {
-                throw new RuntimeException(RESOURCE_BUNDLE.getString("error.configuration_file_not_exist"));
+            if (props.getBasePath() == null) {
+                String confFilePath = props.getConfigFilePath();
+                if (confFilePath == null || !(new File(confFilePath).exists())) {
+                    throw new RuntimeException(RESOURCE_BUNDLE.getString("error.configuration_file_not_exist"));
+                }
             }
             if (StringUtils.isEmpty(props.getApiToken())) {
                 messages.addError(RESOURCE_BUNDLE.getString("error.config.missed_api_token"));

diff --git a/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBuilderTest.java b/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBuilderTest.java
@@ -6,6 +6,7 @@
 import com.crowdin.cli.utils.Utils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -41,6 +42,7 @@ public void testError_EverythingEmpty() {
     }
 
     @Test
+    @Disabled("App can not work without config file")
     public void testOk_Params_WithoutConfigFile() {
         ParamsWithFiles okParams = new ParamsWithFiles() {{
                 setIdParam("666");
@@ -139,6 +141,7 @@ public void testBasePropertiesWithNoValues() {
     }
 
     @Test
+    @Disabled("App can not work without config file")
     public void testProjectProperties() {
         ProjectParams params = new ProjectParams(){{
             setIdParam("123");