Created
March 10, 2012 04:23
-
-
Save kkung/2010130 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 9edc0bd92e7e6075b269b05ba3b6ef8a485e4f53 Mon Sep 17 00:00:00 2001 | |
From: kkung <[email protected]> | |
Date: Sat, 10 Mar 2012 13:23:20 +0900 | |
Subject: [PATCH] fix invalid test(spec changes?) | |
--- | |
build.xml | 2 +- | |
test/veeju/tests/forms/SymbolTest.java | 10 ++++++---- | |
test/veeju/tests/runtime/StringTest.java | 10 ++++++---- | |
3 files changed, 13 insertions(+), 9 deletions(-) | |
diff --git a/build.xml b/build.xml | |
index cda6062..03b2135 100644 | |
--- a/build.xml | |
+++ b/build.xml | |
@@ -97,7 +97,7 @@ value="http://repo2.maven.org/maven2/org/yaml/snakeyaml/1.7/snakeyaml-1.7.jar"/> | |
<arg value="${test.veeju}" /> | |
<arg value="${test.ast}" /> | |
<classpath> | |
- <pathelement location="${test}" /> | |
+ <pathelement location="${test.dst}" /> | |
<pathelement location="${build}" /> | |
<pathelement location="${junit}" /> | |
<pathelement location="${snakeyaml}" /> | |
diff --git a/test/veeju/tests/forms/SymbolTest.java b/test/veeju/tests/forms/SymbolTest.java | |
index a6b0807..8d2e324 100644 | |
--- a/test/veeju/tests/forms/SymbolTest.java | |
+++ b/test/veeju/tests/forms/SymbolTest.java | |
@@ -6,6 +6,7 @@ import static org.junit.Assert.*; | |
import veeju.forms.*; | |
import veeju.runtime.Object; | |
import veeju.runtime.Class; | |
+import veeju.runtime.Runtime; | |
public final class SymbolTest { | |
@Test(expected = IllegalArgumentException.class) | |
@@ -36,11 +37,12 @@ public final class SymbolTest { | |
@Test | |
public void testEvaluate() { | |
- Hashtable<AttributeName, Object> attrs = | |
- new Hashtable<AttributeName, Object>(); | |
- final Object val = new Object(new Class()); | |
+ Hashtable<Symbol, Object> attrs = | |
+ new Hashtable<Symbol, Object>(); | |
+ final Runtime runtime = new Runtime(); | |
+ final Object val = new Object(new Class(null, new Class[] {}, runtime), null); | |
attrs.put(Symbol.create("abc"), val); | |
- final Object env = new Object(new Class(), attrs); | |
+ final Object env = new Object(new Class(null, new Class[] {}, runtime), attrs); | |
assertTrue(val == Symbol.create("abc").evaluate(env)); | |
} | |
diff --git a/test/veeju/tests/runtime/StringTest.java b/test/veeju/tests/runtime/StringTest.java | |
index 6216a40..4070120 100644 | |
--- a/test/veeju/tests/runtime/StringTest.java | |
+++ b/test/veeju/tests/runtime/StringTest.java | |
@@ -6,17 +6,19 @@ import veeju.forms.Symbol; | |
public final class StringTest { | |
veeju.runtime.String string; | |
- | |
+ veeju.runtime.Class metaclass; | |
+ | |
@Before | |
public void setUp() { | |
- string = new veeju.runtime.String(new veeju.runtime.Class(), | |
+ metaclass = new veeju.runtime.Class(null, new veeju.runtime.Class[] {}, new veeju.runtime.Runtime()); | |
+ string = new veeju.runtime.String(metaclass, | |
"test string"); | |
} | |
@Test | |
public void testGetValue_emptyString() { | |
veeju.runtime.String s = new veeju.runtime.String( | |
- new veeju.runtime.Class() | |
+ metaclass | |
); | |
assertEquals("", s.getValue()); | |
} | |
@@ -28,7 +30,7 @@ public final class StringTest { | |
@Test | |
public void testSize() { | |
- assertEquals(new veeju.runtime.String(new veeju.runtime.Class(), "11"), | |
+ assertEquals(new veeju.runtime.String(metaclass, "11"), | |
string.getAttribute(Symbol.create("size"))); | |
} | |
} | |
-- | |
1.7.4.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment