Browse Source

Damn - I forgot to migrate the tests... I love these commit mails :-)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278468 13f79535-47bb-0310-9956-ffa450edef68
master
Jan Materne 20 years ago
parent
commit
ca5f66c954
1 changed files with 49 additions and 3 deletions
  1. +49
    -3
      src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java

+ 49
- 3
src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java View File

@@ -30,6 +30,7 @@ import org.apache.tools.ant.types.Parameter;
import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Path;


// inside MockProject // inside MockProject
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target; import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
@@ -589,12 +590,35 @@ 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() {
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-ResourceSimple");
bft.deleteCachefile();
//new File("src/etc/testcases/types/resources/selectors/cache.properties").delete();
}
public void testResourceSelectorSelresTrue() {
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-ResourceSelresTrue");
bft.assertLogContaining("does not provide an InputStream");
bft.deleteCachefile();
}
public void testResourceSelectorSelresFalse() {
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-ResourceSelresFalse");
bft.deleteCachefile();
}
public void testResourceSelectorScenarioSimple() {
BFT bft = new BFT("modifiedselector");
bft.doTarget("modifiedselectortest-scenario-resourceSimple");
bft.doTarget("modifiedselectortest-scenario-clean");
bft.deleteCachefile();
}
/** /**
* Test the interface semantic of Comparators. * Test the interface semantic of Comparators.
* This method does some common test for comparator implementations. * This method does some common test for comparator implementations.
@@ -874,16 +898,19 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
* and property transfer to that project. * and property transfer to that project.
*/ */
private class BFT extends org.apache.tools.ant.BuildFileTest { private class BFT extends org.apache.tools.ant.BuildFileTest {
String buildfile = "src/etc/testcases/types/selectors.xml";

BFT() { super("nothing"); } BFT() { super("nothing"); }
BFT(String name) { BFT(String name) {
super(name); super(name);
} }
String propfile = "ModifiedSelectorTest.properties"; String propfile = "ModifiedSelectorTest.properties";


boolean isConfigured = false; boolean isConfigured = false;


public void setUp() { public void setUp() {
configureProject("src/etc/testcases/types/selectors.xml");
configureProject(buildfile);
isConfigured = true; isConfigured = true;
} }


@@ -893,6 +920,13 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
if (!isConfigured) setUp(); if (!isConfigured) setUp();
executeTarget(target); executeTarget(target);
} }
protected void assertLogContaining(String substring) {
super.assertLogContaining(substring);
}
protected 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);
@@ -919,9 +953,21 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
new File(getProject().getBaseDir(), propfile).delete(); new File(getProject().getBaseDir(), propfile).delete();
} }


public void deleteCachefile() {
File basedir = new File(buildfile).getParentFile();
File cacheFile = new File(basedir, "cache.properties");
cacheFile.delete();
}

public org.apache.tools.ant.Project getProject() { public org.apache.tools.ant.Project getProject() {
return super.getProject(); return super.getProject();
} }
public String getBuildfile() {
return buildfile;
}
public void setBuildfile(String buildfile) {
this.buildfile = buildfile;
}
}//class-BFT }//class-BFT






Loading…
Cancel
Save