You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/10/24 13:05:16 UTC
svn commit: r1710327 -
/sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
Author: olli
Date: Sat Oct 24 11:05:16 2015
New Revision: 1710327
URL: http://svn.apache.org/viewvc?rev=1710327&view=rev
Log:
SLING-5190 factor out of SlingSettingsServiceImpl a Sling ID util
* make tests more obvious
Modified:
sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
Modified: sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java?rev=1710327&r1=1710326&r2=1710327&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java (original)
+++ sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java Sat Oct 24 11:05:16 2015
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.sling.settings.SlingSettingsService;
import org.junit.After;
import org.junit.Assert;
import org.apache.sling.launchpad.api.StartupHandler;
@@ -67,30 +68,33 @@ public class SlingSettingsServiceImplTes
}
@Test
- public void testGenerateSlingId()
+ public void testGetSlingIdCreating()
throws IOException {
- String slingId = readSlingId(slingIdFile, optionsFile);
+ final SlingSettingsService slingSettingsService = getSlingSettings(slingIdFile, optionsFile);
+
+ final String slingId = slingSettingsService.getSlingId();
Assert.assertNotNull(slingId);
}
@Test
- public void testGetSlingId()
+ public void testGetSlingIdExisting()
throws IOException {
- writeSlingId(slingIdFile, optionsFile, SLING_ID);
- String generated = readSlingId(slingIdFile, optionsFile);
- Assert.assertNotNull(generated);
- Assert.assertEquals(SLING_ID, generated);
- String slingId = readSlingId(slingIdFile, optionsFile);
+ SlingIdUtil.writeSlingId(slingIdFile, SLING_ID);
+ final SlingSettingsService slingSettingsService = getSlingSettings(slingIdFile, optionsFile);
+
+ final String slingId = slingSettingsService.getSlingId();
Assert.assertNotNull(slingId);
- Assert.assertEquals(generated, slingId);
+ Assert.assertEquals(SLING_ID, slingId);
}
@Test
- public void testGetLongSlingIdFromTooLargeData()
+ public void testGetSlingIdFromTooLargeData()
throws IOException {
- String data = SLING_ID + RandomStringUtils.randomAscii(1024 * 1024); // 1MB long random String
- writeSlingId(slingIdFile, optionsFile, data);
- String slingId = readSlingId(slingIdFile, optionsFile);
+ final String data = SLING_ID + RandomStringUtils.randomAscii(1024 * 1024); // 1MB long random String
+ SlingIdUtil.writeSlingId(slingIdFile, data);
+ final SlingSettingsService slingSettingsService = getSlingSettings(slingIdFile, optionsFile);
+
+ final String slingId = slingSettingsService.getSlingId();
Assert.assertNotNull(slingId);
Assert.assertEquals(SLING_ID, slingId);
}
@@ -98,25 +102,15 @@ public class SlingSettingsServiceImplTes
@Test
public void testGetSlingIdFromTooShortData()
throws IOException {
- String data = RandomStringUtils.randomAscii(8); // 8 byte long string
- writeSlingId(slingIdFile, optionsFile, data);
- String slingId = readSlingId(slingIdFile, optionsFile);
+ final String data = RandomStringUtils.randomAscii(8); // 8 byte long string
+ SlingIdUtil.writeSlingId(slingIdFile, data);
+ final SlingSettingsService slingSettingsService = getSlingSettings(slingIdFile, optionsFile);
+
+ final String slingId = slingSettingsService.getSlingId();
Assert.assertNotNull(slingId);
Assert.assertNotEquals(SLING_ID, slingId);
}
- private String readSlingId(File slingIdFile, File optionsFile)
- throws IOException {
- SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
- return SlingIdUtil.readSlingId(slingIdFile);
- }
-
- private void writeSlingId(File slingIdFile, File optionsFile, String slingId)
- throws IOException {
- SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
- SlingIdUtil.writeSlingId(slingIdFile, slingId);
- }
-
private SlingSettingsServiceImpl getSlingSettings(File slingIdFile, File optionsFile)
throws IOException {
BundleContext context = Mockito.mock(BundleContext.class);