Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1147 Rename limbo segment configurations / remove inaccurate comments

Browse Source
This commit is contained in:
ljacqu
2017-03-28 21:49:28 +02:00
parent adb007108d
commit 2ecdc57277
8 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/data/limbo/persistence/DistributedFilesPersistenceHandlerTest.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class DistributedFilesPersistenceHandlerTest {
@BeforeInjecting
public void setUpClasses() throws IOException {
given(settings.getProperty(LimboSettings.SEGMENT_DISTRIBUTION)).willReturn(SegmentConfiguration.SIXTEEN);
given(settings.getProperty(LimboSettings.DISTRIBUTION_SIZE)).willReturn(SegmentSize.SIXTEEN);
dataFolder = temporaryFolder.newFolder();
playerDataFolder = new File(dataFolder, "playerdata");
playerDataFolder.mkdir();
src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentNameBuilderTest.java
+10 -10
View File
@@ -5,13 +5,13 @@ import org.junit.Test;
import java.util.HashSet;
import java.util.Set;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.EIGHT;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.FOUR;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.ONE;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.SIXTEEN;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.SIXTY_FOUR;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.THIRTY_TWO;
import static fr.xephi.authme.data.limbo.persistence.SegmentConfiguration.TWO_FIFTY;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.EIGHT;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.FOUR;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.ONE;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.SIXTEEN;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.SIXTY_FOUR;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.THIRTY_TWO;
import static fr.xephi.authme.data.limbo.persistence.SegmentSize.TWO_FIFTY;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
@@ -23,11 +23,11 @@ public class SegmentNameBuilderTest {
/**
* Checks that using a given segment size really produces as many segments as defined.
* E.g. if we partition with {@link SegmentConfiguration#EIGHT} we expect eight different buckets.
* E.g. if we partition with {@link SegmentSize#EIGHT} we expect eight different buckets.
*/
@Test
public void shouldCreatePromisedSizeOfSegments() {
for (SegmentConfiguration part : SegmentConfiguration.values()) {
for (SegmentSize part : SegmentSize.values()) {
// Perform this check only for `length` <= 5 because the test creates all hex numbers with `length` digits.
if (part.getLength() <= 5) {
checkTotalSegmentsProduced(part);
@@ -35,7 +35,7 @@ public class SegmentNameBuilderTest {
}
}
private void checkTotalSegmentsProduced(SegmentConfiguration part) {
private void checkTotalSegmentsProduced(SegmentSize part) {
// given
SegmentNameBuilder nameBuilder = new SegmentNameBuilder(part);
Set<String> encounteredSegments = new HashSet<>();
src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentConfigurationTest.java → src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentSizeTest.java
+4 -4
View File
@@ -12,9 +12,9 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.fail;
/**
* Test for {@link SegmentConfiguration}.
* Test for {@link SegmentSize}.
*/
public class SegmentConfigurationTest {
public class SegmentSizeTest {
@Test
public void shouldHaveDistributionThatIsPowerOf2() {
@@ -22,7 +22,7 @@ public class SegmentConfigurationTest {
Set<Integer> allowedDistributions = ImmutableSet.of(1, 2, 4, 8, 16);
// when / then
for (SegmentConfiguration entry : SegmentConfiguration.values()) {
for (SegmentSize entry : SegmentSize.values()) {
if (!allowedDistributions.contains(entry.getDistribution())) {
fail("Distribution must be a power of 2 and within [1, 16]. Offending item: " + entry);
}
@@ -35,7 +35,7 @@ public class SegmentConfigurationTest {
Set<Integer> segmentTotals = new HashSet<>();
// when / then
for (SegmentConfiguration entry : SegmentConfiguration.values()) {
for (SegmentSize entry : SegmentSize.values()) {
int totalSegments = entry.getTotalSegments();
assertThat(entry + " must have a positive segment size",
totalSegments, greaterThan(0));