Update tests and Jackson dependency version (#72)

Author: jgwest

Tests/FilewatcherTests/pom.xml

@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.9.10.3</version>
+			<version>[2.9.10.4,)</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

Tests/FilewatcherTests/src/org/eclipse/codewind/filewatchers/test/tests/AbstractTest.java

@@ -96,6 +96,7 @@ public void after() {
 		}
 
 		int filesToDeleteTotal = filesToDelete.size();
+		log.out("* Deleting " + filesToDeleteTotal + " files. ");
 
 		int attempts = 0;
 		while (filesToDelete.size() > 0 && attempts < 50) {
@@ -113,8 +114,10 @@ public void after() {
 			attempts++;
 		}
 
-		log.out("* Deleting " + filesToDeleteTotal + " files. ");
-
+		// Wait 10 seconds after a test run to allow cleanup operations in the
+		// filewatcher to occur (this causes issues when running on Jenkins due to
+		// presumed slower I/O vs a laptop SSD).
+		CodewindTestUtils.sleep(10 * 1000);
 	}
 
 	final PostRequestListFromWatcher changeList = CodewindTestState.getInstance().getChangeListFromWatcher();
@@ -353,24 +356,7 @@ void createRandomDirectoryStructure(List<File> directories, List<File> files, Lo
 		Collections.shuffle(directories);
 
 		// Sort ascending by the number of / in the path
-		Collections.sort(directories, (a, b) -> {
-			int slashCountA = 0;
-			int slashCountB = 0;
-
-			for (int x = 0; x < a.getPath().length(); x++) {
-				if (a.getPath().charAt(x) == File.separator.charAt(0)) {
-					slashCountA++;
-				}
-			}
-
-			for (int x = 0; x < b.getPath().length(); x++) {
-				if (b.getPath().charAt(x) == File.separator.charAt(0)) {
-					slashCountB++;
-				}
-			}
-
-			return slashCountA - slashCountB;
-		});
+		sortDirectoriesAscendingBySlashes(directories);
 
 		for (File dir : directories) {
 			if (!dir.exists() && !dir.mkdirs()) {
@@ -410,6 +396,29 @@ void createRandomDirectoryStructure(List<File> directories, List<File> files, Lo
 
 	}
 
+	/** Sort ascending by the number of / in the path */
+	void sortDirectoriesAscendingBySlashes(List<File> dirList) {
+		Collections.sort(dirList, (a, b) -> {
+			int slashCountA = 0;
+			int slashCountB = 0;
+
+			for (int x = 0; x < a.getPath().length(); x++) {
+				if (a.getPath().charAt(x) == File.separator.charAt(0)) {
+					slashCountA++;
+				}
+			}
+
+			for (int x = 0; x < b.getPath().length(); x++) {
+				if (b.getPath().charAt(x) == File.separator.charAt(0)) {
+					slashCountB++;
+				}
+			}
+
+			return slashCountA - slashCountB;
+		});
+
+	}
+
 	void buildRandomDirectoryStructure(int numFiles, float newDirPercent, long randomNumberSeed, File parent,
 			List<File> outDirectories, List<File> outFiles) {
 

Tests/FilewatcherTests/src/org/eclipse/codewind/filewatchers/test/tests/FilewatcherTests.java

@@ -309,27 +309,49 @@ public void testCanDeleteAfterUnWatch() {
 
 		waitForEventsFromFileList(files, EventType.CREATE, p1);
 
-		for (File f : files) {
-			deleteFile(f);
-			optionalArtificialDelay();
+		while (files.size() > 0) {
+
+			// Delete files 10 at a time
+			List<File> filesRemovedInIteration = new ArrayList<>();
+			int count = 10;
+			while (count > 0 && files.size() > 0) {
+				File f = files.remove(0);
+				filesRemovedInIteration.add(f);
+				deleteFile(f);
+				count--;
+			}
+
+			if (filesRemovedInIteration.size() > 0) {
+				waitForEventsFromFileList(filesRemovedInIteration, EventType.DELETE, p1);
+				optionalArtificialDelay();
+			}
+
 		}
-		waitForEventsFromFileList(files, EventType.DELETE, p1);
 
 		List<File> dirsToDelete = new ArrayList<>(excludeParentDirFromList(dirs, p1));
+		sortDirectoriesAscendingBySlashes(dirsToDelete);
+		Collections.reverse(dirsToDelete); // Flip to descending by number of slashes
+
 		while (dirsToDelete.size() > 0) {
 
-			for (Iterator<File> it = dirsToDelete.iterator(); it.hasNext();) {
-				File f = it.next();
-				f.delete();
-				if (!f.exists()) {
+			// Delete at most 10 directories at a time
+			List<File> filesRemovedInIteration = new ArrayList<>();
+			for (Iterator<File> it = dirsToDelete.iterator(); it.hasNext() && filesRemovedInIteration.size() < 10;) {
+				File dir = it.next();
+				dir.delete();
+				if (!dir.exists()) {
+					filesRemovedInIteration.add(dir);
 					it.remove();
-					optionalArtificialDelay();
 				}
 			}
 
-		}
+			// After each set of 10, wait for them
+			if (filesRemovedInIteration.size() > 0) {
+				waitForEventsFromFileList(excludeParentDirFromList(filesRemovedInIteration, p1), EventType.DELETE, p1);
+				optionalArtificialDelay();
+			}
 
-		waitForEventsFromFileList(excludeParentDirFromList(dirs, p1), EventType.DELETE, p1);
+		}
 
 		boolean canDelete = p1.getLocalPathToMonitor().delete();
 		assertTrue(canDelete);
@@ -637,7 +659,7 @@ public void testRandomFileWritesAcrossMultipleSimultaneousProjects() {
 
 			List<File> filesDeleted = new ArrayList<>();
 
-			while (fileListInProject.size() > 0 && filesDeleted.size() < 20) {
+			while (fileListInProject.size() > 0 && filesDeleted.size() < 10) {
 				Collections.shuffle(fileListInProject);
 				File fileToDelete = fileListInProject.remove(0);
 				filesDeleted.add(fileToDelete);
@@ -646,10 +668,11 @@ public void testRandomFileWritesAcrossMultipleSimultaneousProjects() {
 					projectToFiles.remove(ptw.getProjectID());
 				}
 
-				assertTrue(fileToDelete.delete());
+				deleteFile(fileToDelete);
 			}
 
 			waitForEventsFromFileList(filesDeleted, EventType.DELETE, ptw);
+			optionalArtificialDelay();
 
 		}
 

Tests/MockCwctlSync/src/org/eclipse/codewind/mockcwctl/MockCwctlMain.java

@@ -201,7 +201,6 @@ private static void innerMain(String[] args) throws JsonbException, IOException,
 			for (String watchedFile : pwJson.getFilesToWatch()) {
 				Path watchedFilePath = Paths.get(watchedFile);
 				if (Files.exists(watchedFilePath)) {
-					System.out.println("added:" + watchedFilePath); // TODO: REMOVE
 					allFiles.add(new WalkEntry(watchedFilePath, Files.getLastModifiedTime(watchedFilePath).toMillis()));
 				}
 			}
@@ -429,9 +428,9 @@ private static void writeJsonDB(List<WalkEntry> allFiles, Path previousStateJson
 			try {
 				fe.setModification(Files.getLastModifiedTime(e.path).toMillis());
 			} catch (IOException e1) {
-				System.err.println("Exception on get modificiation - " + e1.getClass().getSimpleName() + ": "
-						+ e1.getMessage() + ". Ignoring file.");
-				return null;
+				System.err.println("Exception on get modification - " + e1.getClass().getSimpleName() + ": "
+						+ e1.getMessage() + ". Not updating the modification time.");
+				fe.setModification(e.modificationTime);
 			}
 			fe.setPath(e.path.toString());
 			return fe;
@@ -459,8 +458,6 @@ private static List<WalkEntry> walkDirectory(Path directoryParam) throws IOExcep
 			Files.list(curr).forEach(e -> {
 				try {
 
-					// TODO: REmove me
-					System.out.println("thing: " + e);
 					result.add(new WalkEntry(e, Files.getLastModifiedTime(e).toMillis()));
 				} catch (IOException e1) {
 					throw new RuntimeException(e1);