@@ -590,12 +590,12 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
}
}
}
}
public void _testCustomComparator() {
public void _testCustomComparator() {
// same logic as on algorithm, no testcases created
// same logic as on algorithm, no testcases created
}
}
public void testResourceSelectorSimple() {
public void testResourceSelectorSimple() {
BFT bft = new BFT("modifiedselector");
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-ResourceSimple");
bft.doTarget("modifiedselectortest-ResourceSimple");
@@ -611,13 +611,13 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
public void testResourceSelectorSelresFalse() {
public void testResourceSelectorSelresFalse() {
BFT bft = new BFT("modifiedselector");
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-ResourceSelresFalse");
bft.doTarget("modifiedselectortest-ResourceSelresFalse");
bft.deleteCachefile();
bft.deleteCachefile();
}
}
public void testResourceSelectorScenarioSimple() {
public void testResourceSelectorScenarioSimple() {
BFT bft = new BFT("modifiedselector");
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-scenario-resourceSimple");
bft.doTarget("modifiedselectortest-scenario-resourceSimple");
bft.doTarget("modifiedselectortest-scenario-clean");
bft.doTarget("modifiedselectortest-scenario-clean");
bft.deleteCachefile();
bft.deleteCachefile();
}
}
/**
/**
* Test the interface semantic of Comparators.
* Test the interface semantic of Comparators.
@@ -904,7 +904,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
BFT(String name) {
BFT(String name) {
super(name);
super(name);
}
}
String propfile = "ModifiedSelectorTest.properties";
String propfile = "ModifiedSelectorTest.properties";
boolean isConfigured = false;
boolean isConfigured = false;
@@ -920,13 +920,6 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
if (!isConfigured) setUp();
if (!isConfigured) setUp();
executeTarget(target);
executeTarget(target);
}
}
public void assertLogContaining(String substring) {
super.assertLogContaining(substring);
}
public void assertOutputContaining(String substring) {
super.assertOutputContaining(substring);
}
public String getProperty(String property) {
public String getProperty(String property) {
return project.getProperty(property);
return project.getProperty(property);
@@ -958,10 +951,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
File cacheFile = new File(basedir, "cache.properties");
File cacheFile = new File(basedir, "cache.properties");
cacheFile.delete();
cacheFile.delete();
}
}
public org.apache.tools.ant.Project getProject() {
return super.getProject();
}
public String getBuildfile() {
public String getBuildfile() {
return buildfile;
return buildfile;
}
}
@@ -991,16 +981,10 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
target.addTask(task);
target.addTask(task);
task.setOwningTarget(target);
task.setOwningTarget(target);
}
}
public void fireBuildStarted() {
super.fireBuildStarted();
}
public void fireBuildFinished() {
public void fireBuildFinished() {
super.fireBuildFinished(null);
super.fireBuildFinished(null);
}
}
public void fireSubBuildStarted() {
super.fireSubBuildStarted();
}
public void fireSubBuildFinished() {
public void fireSubBuildFinished() {
super.fireSubBuildFinished(null);
super.fireSubBuildFinished(null);
}
}