<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</tt></b></td></tr>
<tr><td><tt><a href="#file1">ASMethodTests.java</a></tt> </td><td></td><td align="right" id="added">+39</td><td align="right" id="removed">-15</td><td nowrap="nowrap" align="center">559 -> 560</td></tr>
</table>
<pre class="comment">
increase code coverage in ModifierUtils.java
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>ASMethodTests.java</b></big> <small id="info">559 -> 560</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/ASMethodTests.java 2007-12-03 00:10:37 UTC (rev 559)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/ASMethodTests.java 2007-12-03 00:28:12 UTC (rev 560)
@@ -13,11 +13,12 @@
</small></pre><pre class="diff" id="context"> public class ASMethodTests extends TestCase {
private ActionScriptFactory fact = new ActionScriptFactory();
private ASCompilationUnit unit;
</pre><pre class="diff" id="added">+ private ASClassType clazz;
</pre><pre class="diff" id="context"> private ASMethod meth;
protected void setUp() {
unit = fact.newClass("Test");
</pre><pre class="diff" id="removed">- <span id="removedchars">ASClassType </span>clazz = (ASClassType)unit.getType();
</pre><pre class="diff" id="added">+ clazz = (ASClassType)unit.getType();
</pre><pre class="diff" id="context"> meth = clazz.newMethod("test", Visibility.PUBLIC, null);
}
</pre><pre class="diff"><small id="info">@@ -96,26 +97,21 @@
</small></pre><pre class="diff" id="context"> }
public void testProtection() {
</pre><pre class="diff" id="removed">- assertSame(Visibility.PUBLIC, meth.getVisibility());
</pre><pre class="diff" id="added">+ assertVisibility(Visibility.PUBLIC, meth);
</pre><pre class="diff" id="context"> meth.setVisibility(Visibility.PRIVATE);
</pre><pre class="diff" id="removed">- assertSame(Visibility.PRIVATE, meth.getVisibility());
</pre><pre class="diff" id="added">+ assertVisibility(Visibility.PRIVATE, meth);
</pre><pre class="diff" id="context"> meth.setVisibility(Visibility.PROTECTED);
</pre><pre class="diff" id="removed">- assertSame(Visibility.PROTECTED, meth.getVisibility());
</pre><pre class="diff" id="added">+ assertVisibility(Visibility.PROTECTED, meth);
</pre><pre class="diff" id="context"> meth.setVisibility(Visibility.INTERNAL);
</pre><pre class="diff" id="removed">- assertSame(Visibility.INTERNAL, meth.getVisibility());
</pre><pre class="diff" id="added">+ assertVisibility(Visibility.INTERNAL, meth);
</pre><pre class="diff" id="context"> meth.setVisibility(Visibility.PUBLIC);
</pre><pre class="diff" id="removed">- assertSame(Visibility.PUBLIC, meth.getVisibility());
</pre><pre class="diff" id="added">+ assertVisibility(Visibility.PUBLIC, meth);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- meth.setVisibility(Visibility.DEFAULT);
- assertSame(Visibility.DEFAULT, meth.getVisibility());
- meth.setVisibility(Visibility.PRIVATE);
- assertSame(Visibility.PRIVATE, meth.getVisibility());
</pre><pre class="diff" id="added">+ checkSetVisibilityAfterDefault(meth, Visibility.PRIVATE);
+ checkSetVisibilityAfterDefault(meth, Visibility.PUBLIC);
+ checkSetVisibilityAfterDefault(meth, Visibility.PROTECTED);
+ checkSetVisibilityAfterDefault(meth, Visibility.INTERNAL);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- meth.setVisibility(Visibility.DEFAULT);
- assertSame(Visibility.DEFAULT, meth.getVisibility());
- meth.setVisibility(Visibility.PUBLIC);
- assertSame(Visibility.PUBLIC, meth.getVisibility());
-
</pre><pre class="diff" id="context"> // squeeze out the last bit of code coverage,
assertEquals("public", Visibility.PUBLIC.toString());
assertEquals("private", Visibility.PRIVATE.toString());
</pre><pre class="diff"><small id="info">@@ -123,7 +119,35 @@
</small></pre><pre class="diff" id="context"> assertEquals("internal", Visibility.INTERNAL.toString());
assertEquals("[default]", Visibility.DEFAULT.toString());
}
</pre><pre class="diff" id="added">+
+ private static void assertVisibility(Visibility expectedVisibility,
+ ASMethod method)
+ {
+ assertSame(expectedVisibility, method.getVisibility());
+ }
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ private static void checkSetVisibilityAfterDefault(ASMethod method,
+ Visibility visibility)
+ {
+ method.setVisibility(Visibility.DEFAULT);
+ assertVisibility(Visibility.DEFAULT, method);
+ method.setVisibility(visibility);
+ assertVisibility(visibility, method);
+ }
+
+ public void testProtectionOnCreate() {
+ meth = clazz.newMethod("testDefault", Visibility.DEFAULT, null);
+ assertVisibility(Visibility.DEFAULT, meth);
+ meth = clazz.newMethod("testPublic", Visibility.PUBLIC, null);
+ assertVisibility(Visibility.PUBLIC, meth);
+ meth = clazz.newMethod("testPrivate", Visibility.PRIVATE, null);
+ assertVisibility(Visibility.PRIVATE, meth);
+ meth = clazz.newMethod("testProtected", Visibility.PROTECTED, null);
+ assertVisibility(Visibility.PROTECTED, meth);
+ meth = clazz.newMethod("testInternal", Visibility.INTERNAL, null);
+ assertVisibility(Visibility.INTERNAL, meth);
+ }
+
</pre><pre class="diff" id="context"> public void testArgs() throws IOException {
ASArg foo = meth.addParam("foo", "Number");
assertEquals("foo", foo.getName());
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>