Bug 479450 - Set project encoding when creating a new project

Adopted test expectations to the additional .settings folder created now

Change-Id: Id31f68bc5320ce77faab2f02f4a4a1e3db609a5c
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/192055
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportArchiveFileOperationTest.java

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportArchiveFileOperationTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportArchiveFileOperationTest.java
index a9d9695..57696c7 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportArchiveFileOperationTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportArchiveFileOperationTest.java
@@ -98,7 +98,8 @@
 		operation.setUseTarFormat(false);
 		operation.run(new NullProgressMonitor());
 
-		verifyFolders(directoryNames.length + emptyDirectoryNames.length, ZIP_FILE_EXT);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + emptyDirectoryNames.length + 1, ZIP_FILE_EXT);
 
 	}
 
@@ -151,7 +152,8 @@
 		operation.setUseCompression(false);
 		operation.setUseTarFormat(false);
 		operation.run(new NullProgressMonitor());
-		verifyFolders(directoryNames.length + emptyDirectoryNames.length, ZIP_FILE_EXT);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + emptyDirectoryNames.length + 1, ZIP_FILE_EXT);
 
 		try (ZipFile zipFile = new ZipFile(filePath)) {
 			Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -224,7 +226,8 @@
 
 		operation.run(new NullProgressMonitor());
 
-		verifyFolders(directoryNames.length + emptyDirectoryNames.length, TAR_FILE_EXT);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + emptyDirectoryNames.length + 1, TAR_FILE_EXT);
 	}
 
 	@Test
@@ -499,6 +502,9 @@
 				return;
 			}
 		}
+		if (entryName.equals("org.eclipse.core.resources.prefs")) {
+			return;
+		}
 		fail("Could not find file named: " + entryName);
 	}
 
@@ -506,6 +512,9 @@
 		Iterator<String> folders = folderNames.iterator();
 		while (folders.hasNext()){
 			String folderName = folders.next();
+			if (".settings".equals(folderName)) {
+				continue;
+			}
 			if (!isDirectory(folderName)){
 				if (flattenPaths) {
 					fail(folderName + " is not an expected folder");

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
index 0371d1e..b286224 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
@@ -129,7 +129,8 @@
 					null, resources, localDirectory, this);
 		openTestWindow().run(true, true, operation);
 
-		verifyFolders(directoryNames.length);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + 1);
 	}
 
 	/* Export a project, create all leadup folders. */
@@ -143,7 +144,8 @@
 					null, resources, localDirectory, this);
 		openTestWindow().run(true, true, operation);
 
-		verifyFolders(directoryNames.length);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + 1);
 	}
 
 	/* Export folders, do not create leadup folders. */
@@ -207,7 +209,8 @@
 		operation.setCreateLeadupStructure(false);
 		openTestWindow().run(true, true, operation);
 
-		verifyFolders(directoryNames.length);
+		// +1 for .settings
+		verifyFolders(directoryNames.length + 1);
 	}
 
 	private boolean isFile(IResource resource){