Oscar Scholten pushed to branch release/2.2 at cms / hippo-services-webfiles
Commits: 28aa055e by Oscar Scholten at 2016-02-15T17:34:57+01:00 CMS-9933: adding creation of empty folder to test fixture setup - - - - - e7d11c06 by Mathijs den Burger at 2016-02-15T17:42:19+01:00 CMS-9933 Simplify creation of empty folder in test fixture The fixture is already copied into a temporary directory before each test, so the empty directory will never exist already. If it would already exist, mkdir() would throw an exception and the test would fail automatically. - - - - - cf3d983f by Oscar Scholten at 2016-02-17T11:23:01+01:00 Reintegrate bugfix/CMS-9933 - - - - - 1 changed file: - src/test/java/org/onehippo/cms7/services/webfiles/watch/AbstractWatcherIT.java Changes: ===================================== src/test/java/org/onehippo/cms7/services/webfiles/watch/AbstractWatcherIT.java ===================================== --- a/src/test/java/org/onehippo/cms7/services/webfiles/watch/AbstractWatcherIT.java +++ b/src/test/java/org/onehippo/cms7/services/webfiles/watch/AbstractWatcherIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TemporaryFolder; -import org.onehippo.cms7.services.webfiles.util.WatchFilesUtils; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -67,7 +66,7 @@ public class AbstractWatcherIT { FileUtils.copyDirectory(testBundleFixture, testBundleDir); emptyDir = new File(testBundleDir, "empty"); - assertTrue(emptyDir.isDirectory()); + emptyDir.mkdir(); cssDir = new File(testBundleDir, "css"); assertTrue(cssDir.isDirectory()); View it on GitLab: https://code.onehippo.org/cms/hippo-services-webfiles/compare/5351ccc4aedd803311604e921561afe7bdc74617...cf3d983fc514868534b3032c75d65811e5865d64
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
