asserts/test/net/sf/cotta/test/assertion/BaseAssertTest.java @@ -2,9 +2,9 @@ <classpath> <classpathentry kind="src" path="test"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/hamcrest/hamcrest-library-1.1.jar"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/hamcrest/hamcrest-core-1.1.jar"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/junit/junit-4.4.jar" sourcepath="D:/Work/cotta/lib/junit/src/junit-4.4-src.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk5"/> <classpathentry kind="output" path="bin"/> </classpath> asserts/.classpath @@ -47,8 +47,8 @@ public class AssertionFactory { * @param block CodeBlock instance to assert * @return CodeBlockAssert instance */ - public CodeBlockAssertion that(CodeBlock block) { - return new CodeBlockAssertion(block); + public CodeBlockAssert that(CodeBlock block) { + return new CodeBlockAssert(block); } /** @@ -57,7 +57,7 @@ public class AssertionFactory { * @param block CodeBlock instance to assert * @return CodeBlockAssert instance */ - public CodeBlockAssertion code(CodeBlock block) { + public CodeBlockAssert code(CodeBlock block) { return that(block); } asserts/src/net/sf/cotta/test/AssertionFactory.java @@ -17,7 +17,7 @@ import org.junit.matchers.JUnitMatchers; * @param <T> Type of the value under assertion * @param <A> Type of the current assertion class */ -abstract public class BaseAssert<T, A> extends Assert { +public class BaseAssert<T, A> extends Assert { private String description = ""; private T value; @@ -30,15 +30,32 @@ abstract public class BaseAssert<T, A> extends Assert { return (A) this; } + /** + * Sets the description for the current assertion + * @param description description to show up when assertion failed + * @return self + */ public A describedAs(String description) { this.description = description; return self(); } + /** + * Returns value under assertion + * @return value under assertion + */ public T value() { return this.value; } + /** + * This method is overriden to prevent misuse. There is no need to compare assert classes, at + * the same time, it is easy for developer to call this method thinking that it does assertions + * on equals + * @see #eq + * @param obj object to compare + * @return this method will always throw UnsupportedOperationException + */ @SuppressWarnings({"EqualsWhichDoesntCheckParameterClass"}) public boolean equals(Object obj) { throw new UnsupportedOperationException("equals method is not supported by assertion, you probably wanted to use eq method"); asserts/src/net/sf/cotta/test/assertion/BaseAssert.java @@ -1,4 +1,29 @@ package net.sf.cotta.test.assertion; +import org.junit.Assert; + public class CodeBlockAssert { + protected CodeBlock block; + + public CodeBlockAssert(CodeBlock block) { + this.block = block; + } + + public <T extends Throwable> ExceptionAssert throwsException(Class<T> expected) { + try { + block.execute(); + } catch (Throwable e) { + if (expected.equals(e.getClass())) { + return new ExceptionAssert(e); + } + if (e instanceof RuntimeException) { + throw (RuntimeException) e; + } else { + throw new RuntimeException("Error occurred during code block:" + e.getMessage(), e); + } + } + StringBuilder buffer = new StringBuilder("Exception should have been thrown: " + expected); + Assert.fail(buffer.toString()); + return null; + } } asserts/src/net/sf/cotta/test/assertion/CodeBlockAssert.java @@ -1,29 +1,13 @@ package net.sf.cotta.test.assertion; -import org.junit.Assert; - -public class CodeBlockAssertion { - private CodeBlock block; +/** + * @deprecated use net.sf.cotta.test.assertion.CodeBlockAssert + * @see net.sf.cotta.test.assertion.CodeBlockAssert + */ +public class CodeBlockAssertion extends CodeBlockAssert{ public CodeBlockAssertion(CodeBlock block) { - this.block = block; + super(block); } - public <T extends Throwable> ExceptionAssert throwsException(Class<T> expected) { - try { - block.execute(); - } catch (Throwable e) { - if (expected.equals(e.getClass())) { - return new ExceptionAssert(e); - } - if (e instanceof RuntimeException) { - throw (RuntimeException) e; - } else { - throw new RuntimeException("Error occurred during code block:" + e.getMessage(), e); - } - } - StringBuilder buffer = new StringBuilder("Exception should have been thrown: " + expected); - Assert.fail(buffer.toString()); - return null; - } } asserts/src/net/sf/cotta/test/assertion/CodeBlockAssertion.java @@ -7,7 +7,7 @@ public class IntegerAssertTest extends TestCase { public void testLessThanFailsWhenNotTrue() { final IntegerAssert assertion = new IntegerAssert(5); - code(new CodeBlock() { + ensure.code(new CodeBlock() { public void execute() throws Exception { assertion.lt(4); } @@ -20,7 +20,7 @@ public class IntegerAssertTest extends TestCase { public void testGreaterThanFailsWhenNotTrue() { final IntegerAssert assertion = new IntegerAssert(6); - code(new CodeBlock() { + ensure.code(new CodeBlock() { public void execute() throws Exception { assertion.gt(6); } asserts/test/net/sf/cotta/test/assertion/IntegerAssertTest.java @@ -4,7 +4,7 @@ public class ObjectAssertTest extends TestCase { public void testDescribeAs() { Object instance = new Object(); final ObjectAssert assertion = new ObjectAssert(instance).describedAs("description"); - code(new CodeBlock() { + ensure.code(new CodeBlock() { public void execute() throws Exception { assertion.sameAs(new Object()); } @@ -14,7 +14,7 @@ public class ObjectAssertTest extends TestCase { public void testOverrideEqualsToThrowException() { final Object instance = new Object(); final ObjectAssert assertion = new ObjectAssert(instance); - code(new CodeBlock() { + ensure.code(new CodeBlock() { public void execute() throws Exception { boolean result = assertion.equals(instance); assertEquals("shoud not get here", !result, result); asserts/test/net/sf/cotta/test/assertion/ObjectAssertTest.java @@ -5,7 +5,4 @@ import net.sf.cotta.test.AssertionFactory; abstract public class TestCase extends junit.framework.TestCase { public static final AssertionFactory ensure = new AssertionFactory(); - public CodeBlockAssertion code(CodeBlock codeBlock) { - return new CodeBlockAssertion(codeBlock); - } } asserts/test/net/sf/cotta/test/assertion/TestCase.java @@ -3,7 +3,7 @@ <classpathentry kind="src" path="behaviour/src"/> <classpathentry kind="src" path="behaviour/resources"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/> <classpathentry combineaccessrules="false" kind="src" path="/cotta-testbase"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk6"/> <classpathentry kind="output" path="bin"/> </classpath> core/.classpath @@ -29,7 +29,7 @@ abstract public class InputFileChannelTestCase extends TestCase { InputFileChannelTestCase.this.process(inputManager.channel()); } }); - FileChannel channel = file.io().inputChannel(); + FileChannel channel = file.inputChannel(); process(channel); channel.close(); } core/behaviour/src/net/sf/cotta/acceptance/InputFileChannelTestCase.java @@ -125,33 +125,20 @@ <component name="IdProvider" IDEtalkID="F41CAA6E81596D1A0C15ED02912B093E" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_PROFILE" value="true" /> <version value="1.0" /> <profiles> <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> <option name="myLocal" value="false" /> - <inspection_tool class="UNUSED_SYMBOL" enabled="true" level="WARNING" enabled_by_default="true"> - <option name="LOCAL_VARIABLE" value="true" /> - <option name="FIELD" value="true" /> - <option name="METHOD" value="true" /> - <option name="CLASS" value="true" /> - <option name="PARAMETER" value="true" /> - <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" /> - <option name="INJECTION_ANNOS"> - <value> - <list size="1"> - <item index="0" class="java.lang.String" itemvalue="java.lang.Deprecated" /> - </list> - </value> - </option> - </inspection_tool> </profile> </profiles> - <list size="4"> - <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" /> - <item index="1" class="java.lang.String" itemvalue="INFO" /> - <item index="2" class="java.lang.String" itemvalue="WARNING" /> - <item index="3" class="java.lang.String" itemvalue="ERROR" /> + <list size="5"> + <item index="0" class="java.lang.String" itemvalue="TYPO" /> + <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" /> + <item index="2" class="java.lang.String" itemvalue="INFO" /> + <item index="3" class="java.lang.String" itemvalue="WARNING" /> + <item index="4" class="java.lang.String" itemvalue="ERROR" /> </list> </component> <component name="JavacSettings"> @@ -316,6 +303,9 @@ <component name="ProjectDetails"> <option name="projectName" value="cotta" /> </component> + <component name="ProjectDictionaryState"> + <dictionary name="Lianxin and Shane" /> + </component> <component name="ProjectFileVersion" converted="true" /> <component name="ProjectKey"> <option name="state" value="project://D:\Work\cotta\cotta.ipr" /> @@ -418,8 +408,5 @@ </SOURCES> </library> </component> - <UsedPathMacros> - <macro name="IDEA_HOME" /> - </UsedPathMacros> </project> cotta.ipr @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="behaviour/src"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/> <classpathentry combineaccessrules="false" kind="src" path="/cotta-core"/> <classpathentry combineaccessrules="false" kind="src" path="/cotta-testbase"/> <classpathentry kind="lib" path="D:/Work/cotta/lib/commons-io/commons-io-1.4.jar"/> @@ -12,5 +11,6 @@ <classpathentry kind="lib" path="D:/Work/cotta/lib/coloradoftp/coloradoftp-1.24.jar" sourcepath="D:/Work/cotta/lib/coloradoftp/src/coloradoftp-1.24-src.zip"/> <classpathentry kind="lib" path="D:/Work/cotta/lib/coloradoftp/commons-logging.jar"/> <classpathentry kind="lib" path="D:/Work/cotta/lib/coloradoftp/log4j-1.2.9.jar" sourcepath="D:/Work/cotta/lib/coloradoftp/src/log4j-1.2.9-src.zip"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk5"/> <classpathentry kind="output" path="bin"/> </classpath> ftp/.classpath @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/jmock/objenesis-1.0.jar"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/jmock/cglib-nodep-2.1_3.jar" sourcepath="D:/Work/cotta/lib/jmock/cglib-2.1_3-src.jar"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/jmock/jmock-2.4.0.jar"/> @@ -10,5 +9,6 @@ <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/jmock/jmock-junit4-2.4.0.jar"/> <classpathentry exported="true" kind="lib" path="D:/Work/cotta/lib/jmock/jmock-legacy-2.4.0.jar"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/cotta-asserts"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk5"/> <classpathentry kind="output" path="bin"/> </classpath> testbase/.classpath 88f06946e9526bd226ef1b0b90c7db299a907647 wolfdancer Lianxin and Shane@.(none) http://github.com/wolfdancer/cotta/commit/bcf9f10fed76571d29ce4af1226e22250e771e1f bcf9f10fed76571d29ce4af1226e22250e771e1f 2009-08-22T14:43:54-07:00 2009-08-22T14:43:54-07:00 use CodeBlockAssert instead of CodeBlockAssertion to match name convention, made BaseAssert a concrete class 3fd57d09760a93631f953d4b06dd8a696b0201a0 wolfdancer Lianxin and Shane@.(none)