Maven: correctly excluding output folders (IDEA-20803)

plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java

@@ -116,10 +116,8 @@ public class MavenFoldersImporter {
       myModel.useModuleOutput(myMavenProject.getOutputDirectory(),
                               myMavenProject.getTestOutputDirectory());
     }
-    else {
-      myModel.addExcludedFolder(myMavenProject.getOutputDirectory());
-      myModel.addExcludedFolder(myMavenProject.getTestOutputDirectory());
-    }
+    myModel.addExcludedFolder(myMavenProject.getOutputDirectory());
+    myModel.addExcludedFolder(myMavenProject.getTestOutputDirectory());
   }
 
   private void configExcludedFolders() {

plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java

@@ -588,7 +588,10 @@ public class FoldersImportingTest extends MavenImportingTestCase {
 
     assertModules("project");
 
-    assertExcludes("project", "targetCustom");
+    assertExcludes("project",
+                   "targetCustom",
+                   "outputCustom",
+                   "testCustom");
     assertModuleOutput("project",
                        getProjectPath() + "/outputCustom",
                        getProjectPath() + "/testCustom");

plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java

@@ -28,7 +28,7 @@ import org.jetbrains.idea.maven.importing.MavenRootModelAdapter;
 
 import java.io.File;
 
-public class MavenFoldersConfiguratorTest extends MavenImportingTestCase {
+public class MavenFoldersImporterTest extends MavenImportingTestCase {
   public void testUpdatingExternallyCreatedFolders() throws Exception {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>project</artifactId>" +