On Wed, May 6, 2009 at 11:34 AM, Justin Sherrill
<jlsherr...@fedoraproject.org> wrote:
> java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
> | 2 -
> java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
> | 3 +-
> java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScriptActionTest.java
> | 2 +
> java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
> | 13 ++++++++++
> 4 files changed, 18 insertions(+), 2 deletions(-)
>
> New commits:
> commit 8821fb911e118507aeda4de789e5949cba522d74
> Author: Justin Sherrill <jlshe...@justin-sherrills-macbook-2.local>
> Date: Wed May 6 11:32:57 2009 -0400
>
> unit test fixes
>
> diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
> b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
> index db2970c..b1d4c91 100644
> --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
> +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
> @@ -1226,7 +1226,7 @@ public class KickstartData {
> while (i.hasNext()) {
> KickstartScript kss = (KickstartScript) i.next();
> KickstartScript ksscloned = kss.deepCopy(cloned);
> - cloned.addScript(ksscloned);
> + cloned.addScript(ksscloned);
> }
> }
>
> diff --git
> a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
> b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
> index cd52cb1..d189b2c 100644
> --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
> +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
> @@ -37,7 +37,7 @@ public class KickstartScript implements
> Comparable<KickstartScript> {
> private byte[] data;
> private Date created;
> private Date modified;
> - private Boolean raw;
> + private Boolean raw = true;
Why not use private boolean? Seems odd to use the Object version.
>
> private KickstartData ksdata;
>
> @@ -234,6 +234,7 @@ public class KickstartScript implements
> Comparable<KickstartScript> {
> cloned.setKsdata(ksDataIn);
> cloned.setPosition(this.getPosition());
> cloned.setScriptType(this.getScriptType());
> + cloned.setRaw(this.getRaw());
> return cloned;
> }
>
> diff --git
> a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScriptActionTest.java
>
> b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScriptActionTest.java
> index dcc41af..3db72a8 100644
> ---
> a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScriptActionTest.java
> +++
> b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScriptActionTest.java
> @@ -56,6 +56,8 @@ public class KickstartScriptActionTest extends
> BaseKickstartEditTestCase {
> KickstartScript.TYPE_POST);
> addRequestParameter(KickstartScriptCreateAction.SUBMITTED,
> Boolean.TRUE.toString());
> + addRequestParameter(KickstartScriptCreateAction.TEMPLATE,
> + Boolean.TRUE.toString());
> setRequestPathInfo("/kickstart/KickstartScriptCreate");
> actionPerform();
> String[] keys = {"kickstart.script.toolarge"};
> diff --git
> a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
>
> b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
> index 5e519e8..a74322e 100644
> ---
> a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
> +++
> b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
> @@ -123,6 +123,19 @@ public class BaseKickstartScriptCommand extends
> BaseKickstartCommand {
> return KickstartScript.TYPE_PRE;
> }
> }
> +
> + /**
> + * gets whether the script is raw or not.
> + * @return true or false
> + */
> + public boolean getRaw() {
> + if (this.script != null) {
> + return this.script.getRaw();
> + }
> + else {
> + return true;
> + }
> + }
remove the unnecessary else:
public boolean getRaw() {
if (script != null) {
return script.getRaw();
}
return true;
}
jesus
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
