Skip to content

Commit

Permalink
GEODE-6033: Support dynamic VMs in DistributedDiskDirRule
Browse files Browse the repository at this point in the history
* Create tests for DiskDirRule and DistributedDiskDirRule.
* Fix a couple minor issues found by testing DiskDirRule.
* Make DistributedDiskDirRule support create and bounce VMs.
  • Loading branch information
kirklund committed Feb 14, 2019
1 parent dae8323 commit 8a782b0
Show file tree
Hide file tree
Showing 4 changed files with 294 additions and 187 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
package org.apache.geode.test.dunit.rules.tests;

import static org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
import static org.apache.geode.test.dunit.VM.getAllVMs;
import static org.apache.geode.test.dunit.VM.getController;
import static org.apache.geode.test.dunit.VM.getVM;
import static org.apache.geode.test.dunit.VM.getVMCount;
import static org.apache.geode.test.dunit.VM.toArray;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

import org.junit.Rule;
import org.junit.Test;

import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedRule;

/**
* Distributed tests for {@link DistributedDiskDirRule}.
*/
@SuppressWarnings("serial")
public class DistributedDiskDirRuleDistributedTest implements Serializable {

@Rule
public DistributedRule distributedRule = new DistributedRule();

@Rule
public DistributedDiskDirRule distributedDiskDirRule = new DistributedDiskDirRule();

@Test
public void setsDefaultDiskDirsPropertyInEveryVm() {
for (VM vm : toArray(getAllVMs(), getController())) {
vm.invoke(() -> {
String propertyValue = System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY);

assertThat(propertyValue)
.isEqualTo(distributedDiskDirRule.getDiskDirFor(vm).getAbsolutePath());
});
}
}

@Test
public void everyVmHasUniqueDefaultDiskDirsValue() {
List<String> propertyValues = new ArrayList<>();

for (VM vm : toArray(getAllVMs(), getController())) {
String propertyValue =
vm.invoke(() -> System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY));
assertThat(propertyValues).doesNotContain(propertyValue);
propertyValues.add(propertyValue);
}

assertThat(propertyValues).hasSize(getVMCount() + 1);
}

@Test
public void defaultDiskDirsPropertyIsSetInNewVm() {
VM newVM = getVM(getVMCount());

String propertyValue =
newVM.invoke(() -> System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY));

assertThat(propertyValue).isNotNull();
}

@Test
public void defaultDiskDirsPropertyIsKeptInBouncedVm() {
String propertyValueBeforeBounce =
getVM(0).invoke(() -> System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY));

getVM(0).bounce();

String propertyValueAfterBounce =
getVM(0).invoke(() -> System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY));
assertThat(propertyValueAfterBounce).isEqualTo(propertyValueBeforeBounce);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
package org.apache.geode.test.junit.rules;

import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.File;

import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;

import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;

/**
* Integration tests for {@link DiskDirRule}.
*/
public class DiskDirRuleIntegrationTest {

@Rule
public DiskDirRule diskDirRule = new DiskDirRule();

@Rule
public TestName testName = new TestName();

private String diskDirPath;
private InternalCache cache;

@Before
public void setUp() {
diskDirPath = diskDirRule.getDiskDir().getAbsolutePath();
}

@After
public void tearDown() {
if (cache != null) {
cache.close();
}
}

@Test
public void diskDirPathContainsTestClassName() {
assertThat(diskDirPath).containsOnlyOnce(getClass().getName());
}

@Test
public void diskDirPathContainsTestMethodName() {
assertThat(diskDirPath).containsOnlyOnce(testName.getMethodName());
}

@Test
public void diskDirPathContainsDiskDirsLiteral() {
assertThat(diskDirPath).containsOnlyOnce("diskDirs");
}

@Test
public void setsDefaultDiskDirsSystemProperty() {
String propertyValue = System.getProperty(GEODE_PREFIX + DEFAULT_DISK_DIRS_PROPERTY);

assertThat(propertyValue).isEqualTo(diskDirRule.getDiskDir().getAbsolutePath());
}

@Test
public void cacheUsesDefaultDiskDirProvidedByRule() {
cache = (InternalCache) new CacheFactory().set(LOCATORS, "").create();

DiskStoreImpl diskStore = cache.getOrCreateDefaultDiskStore();
File[] diskDirs = diskStore.getDiskDirs();

assertThat(diskDirs).containsExactly(diskDirRule.getDiskDir());
}
}
Loading

0 comments on commit 8a782b0

Please sign in to comment.