Menu
▾
▴
[Ant-contrib-developers] CVS: cpptasks/test/junit/net/sf/antcontrib/cpptasks TestAllClasses.java,1.7,1.8 TestCompilerDef.java,1.4,1.5 TestLinkerDef.java,1.3,1.4 TestProcessorDef.java,1.3,1.4
|
From: Curt A. <ca...@us...> - 2002-04-17 13:39:19
|
Update of /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks
In directory usw-pr-cvs1:/tmp/cvs-serv6699/junit/net/sf/antcontrib/cpptasks
Modified Files:
TestAllClasses.java TestCompilerDef.java TestLinkerDef.java
TestProcessorDef.java
Log Message:
Changed processor name to enum and distinct classname attributes
Index: TestAllClasses.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/TestAllClasses.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestAllClasses.java 16 Apr 2002 05:39:47 -0000 1.7
--- TestAllClasses.java 17 Apr 2002 13:39:13 -0000 1.8
***************
*** 71,75 ****
addTestSuite(net.sf.antcontrib.cpptasks.TestCCTask.class);
addTestSuite(net.sf.antcontrib.cpptasks.compiler.TestCommandLineCompilerConfiguration.class);
- addTestSuite(net.sf.antcontrib.cpptasks.TestCompilerDef.class);
addTestSuite(net.sf.antcontrib.cpptasks.TestCUtil.class);
addTestSuite(net.sf.antcontrib.cpptasks.types.TestDefineArgument.class);
--- 71,74 ----
***************
*** 79,82 ****
--- 78,82 ----
addTestSuite(net.sf.antcontrib.cpptasks.TestTargetInfo.class);
addTestSuite(net.sf.antcontrib.cpptasks.types.TestLibrarySet.class);
+ addTestSuite(net.sf.antcontrib.cpptasks.TestCompilerDef.class);
}
Index: TestCompilerDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/TestCompilerDef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestCompilerDef.java 20 Mar 2002 06:38:18 -0000 1.4
--- TestCompilerDef.java 17 Apr 2002 13:39:13 -0000 1.5
***************
*** 165,176 ****
public void testGetMSVC() {
! Compiler comp = CompilerDef.createCompiler("msvc");
! assertNotNull(comp);
! assertSame(DevStudioCCompiler.getInstance(), comp);
! }
!
! public void testGetMSVC2() {
! Compiler comp = CompilerDef.createCompiler(
! "net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler");
assertNotNull(comp);
assertSame(DevStudioCCompiler.getInstance(), comp);
--- 165,171 ----
public void testGetMSVC() {
! CompilerDef compilerDef = (CompilerDef) create();
! compilerDef.setClassname("net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler");
! Compiler comp = (Compiler) compilerDef.getProcessor();
assertNotNull(comp);
assertSame(DevStudioCCompiler.getInstance(), comp);
***************
*** 178,189 ****
public void testGetGcc() {
! Compiler comp = CompilerDef.createCompiler("gcc");
! assertNotNull(comp);
! assertSame(GccCCompiler.getInstance(), comp);
! }
!
! public void testGetGcc2() {
! Compiler comp = CompilerDef.createCompiler(
! "net.sf.antcontrib.cpptasks.gcc.GccCCompiler");
assertNotNull(comp);
assertSame(GccCCompiler.getInstance(), comp);
--- 173,179 ----
public void testGetGcc() {
! CompilerDef compilerDef = (CompilerDef) create();
! compilerDef.setClassname("net.sf.antcontrib.cpptasks.gcc.GccCCompiler");
! Compiler comp = (Compiler) compilerDef.getProcessor();
assertNotNull(comp);
assertSame(GccCCompiler.getInstance(), comp);
***************
*** 191,206 ****
public void testUnknownClass() {
! Compiler comp = CompilerDef.createCompiler(
! "net.sf.antcontrib.cpptasks.bogus.BogusCompiler");
! assertNull(comp);
}
public void testWrongType() {
! Compiler comp = CompilerDef.createCompiler(
! "net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker");
! assertNotNull(comp);
! assertSame(DevStudioCCompiler.getInstance(), comp);
}
-
-
}
--- 181,201 ----
public void testUnknownClass() {
! CompilerDef compilerDef = (CompilerDef) create();
! try {
! compilerDef.setClassname("net.sf.antcontrib.cpptasks.bogus.BogusCompiler");
! } catch(BuildException ex) {
! return;
! }
! fail("Exception not thrown");
}
public void testWrongType() {
! CompilerDef compilerDef = (CompilerDef) create();
! try {
! compilerDef.setClassname("net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker");
! } catch(BuildException ex) {
! return;
! }
! fail("Exception not thrown");
}
}
Index: TestLinkerDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/TestLinkerDef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestLinkerDef.java 20 Mar 2002 06:38:18 -0000 1.3
--- TestLinkerDef.java 17 Apr 2002 13:39:13 -0000 1.4
***************
*** 58,62 ****
import java.io.*;
import java.util.*;
! import net.sf.antcontrib.cpptasks.*;
import net.sf.antcontrib.cpptasks.types.*;
import junit.framework.*;
--- 58,62 ----
import java.io.*;
import java.util.*;
! import net.sf.antcontrib.cpptasks.compiler.Compiler;
import net.sf.antcontrib.cpptasks.types.*;
import junit.framework.*;
***************
*** 78,89 ****
public void testGetMSVC() {
! Linker comp = LinkerDef.createLinker("msvc");
! assertNotNull(comp);
! assertSame(DevStudioLinker.getInstance(), comp);
! }
!
! public void testGetMSVC2() {
! Linker comp = LinkerDef.createLinker(
"net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker");
assertNotNull(comp);
assertSame(DevStudioLinker.getInstance(), comp);
--- 78,85 ----
public void testGetMSVC() {
! LinkerDef linkerDef = (LinkerDef) create();
! linkerDef.setClassname(
"net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker");
+ Linker comp = (Linker) linkerDef.getProcessor();
assertNotNull(comp);
assertSame(DevStudioLinker.getInstance(), comp);
***************
*** 91,102 ****
public void testGetGcc() {
! Linker comp = LinkerDef.createLinker("gcc");
! assertNotNull(comp);
! assertSame(GccLinker.getInstance(), comp);
! }
!
! public void testGetGcc2() {
! Linker comp = LinkerDef.createLinker(
! "net.sf.antcontrib.cpptasks.gcc.GccLinker");
assertNotNull(comp);
assertSame(GccLinker.getInstance(), comp);
--- 87,94 ----
public void testGetGcc() {
! LinkerDef linkerDef = (LinkerDef) create();
! linkerDef.setClassname(
! "net.sf.antcontrib.cpptasks.gcc.GccLinker");
! Linker comp = (Linker) linkerDef.getProcessor();
assertNotNull(comp);
assertSame(GccLinker.getInstance(), comp);
***************
*** 104,117 ****
public void testUnknownClass() {
! Linker comp = LinkerDef.createLinker(
! "net.sf.antcontrib.cpptasks.bogus.BogusLinker");
! assertNull(comp);
}
public void testWrongType() {
! Linker comp = LinkerDef.createLinker(
"net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler");
! assertNotNull(comp);
! assertSame(DevStudioLinker.getInstance(),comp);
}
--- 96,118 ----
public void testUnknownClass() {
! LinkerDef linkerDef = (LinkerDef) create();
! try {
! linkerDef.setClassname(
! "net.sf.antcontrib.cpptasks.bogus.BogusLinker");
! } catch(BuildException ex) {
! return;
! }
! fail("should have thrown exception");
}
public void testWrongType() {
! LinkerDef linkerDef = (LinkerDef) create();
! try {
! linkerDef.setClassname(
"net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler");
! } catch(BuildException ex) {
! return;
! }
! fail("should have thrown exception");
}
Index: TestProcessorDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/TestProcessorDef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestProcessorDef.java 9 Apr 2002 06:50:43 -0000 1.3
--- TestProcessorDef.java 17 Apr 2002 13:39:13 -0000 1.4
***************
*** 78,87 ****
public DummyProcessorDef() {
}
- public void setName(String name) throws BuildException {
- super.setName(name);
- if(name.equals("bogus")) {
- throw new BuildException("bogus name used");
- }
- }
}
--- 78,81 ----
***************
*** 90,126 ****
}
! public void testSetNameMSVC() {
! ProcessorDef def = create();
! def.setName("msvc");
! }
! public void testSetNameMSVC2() {
! ProcessorDef def = create();
! def.setName("net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler");
! }
! public void testSetNameGcc() {
! ProcessorDef def = create();
! def.setName("gcc");
! }
! public void testSetNameGcc2() {
! ProcessorDef def = create();
! def.setName("net.sf.antcontrib.cpptasks.gcc.GccCCompiler");
! }
! public void TestSetNameBogus() {
! ProcessorDef def = create();
! //
! // processors should throw exception for a bogus name
! //
! try {
! def.setName("bogus");
! }
! catch(BuildException ex) {
! return;
! }
! fail("Should thrown exception BuildException");
! }
}
--- 84,155 ----
}
! public void testIsActive2() {
! ProcessorDef arg = create();
! Project project = new Project();
! project.setProperty("cond","");
! arg.setProject(project);
! arg.setIf("cond");
! assertTrue(arg.isActive());
! }
! public void testIsActive3() {
! ProcessorDef arg = create();
! arg.setProject(new Project());
! arg.setIf("cond");
! assertTrue(!arg.isActive());
! }
! public void testIsActive4() {
! ProcessorDef arg = create();
! Project project = new Project();
! project.setProperty("cond","false");
! arg.setProject(project);
! arg.setIf("cond");
! try {
! boolean isActive = arg.isActive();
! } catch (BuildException ex) {
! return;
! }
! fail("Should throw exception for suspicious value");
! }
! public void testIsActive5() {
! ProcessorDef arg = create();
! Project project = new Project();
! project.setProperty("cond","");
! arg.setProject(project);
! arg.setUnless("cond");
! assertTrue(!arg.isActive());
! }
! public void testIsActive6() {
! ProcessorDef arg = create();
! arg.setProject(new Project());
! arg.setUnless("cond");
! assertTrue(arg.isActive());
! }
!
! public void testIsActive7() {
! ProcessorDef arg = create();
! Project project = new Project();
! project.setProperty("cond","false");
! arg.setProject(project);
! arg.setUnless("cond");
! try {
! boolean isActive = arg.isActive();
! } catch (BuildException ex) {
! return;
! }
! fail("Should throw exception for suspicious value");
! }
+ public void testIsActive8() {
+ ProcessorDef arg = create();
+ Project project = new Project();
+ project.setProperty("cond","");
+ arg.setProject(project);
+ arg.setIf("cond");
+ arg.setUnless("cond");
+ assertTrue(!arg.isActive());
+ }
}
|