velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r627192 - in /velocity/tools/trunk/src: main/java/org/apache/velocity/tools/config/Data.java test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
Date Wed, 13 Feb 2008 00:03:51 GMT
Author: nbubna
Date: Tue Feb 12 16:03:43 2008
New Revision: 627192

URL: http://svn.apache.org/viewvc?rev=627192&view=rev
Log:
if we aren't going to make the Type enum public, there's no good reason to have the DEFAULT_TYPE
constant public

Modified:
    velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/Data.java
    velocity/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/Data.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/Data.java?rev=627192&r1=627191&r2=627192&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/Data.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/Data.java Tue Feb
12 16:03:43 2008
@@ -37,7 +37,7 @@
  */
 public class Data implements Comparable<Data>
 {
-    public static final Type DEFAULT_TYPE = Type.AUTO;
+    protected static final Type DEFAULT_TYPE = Type.AUTO;
 
     private String key;
     private String typeValue;

Modified: velocity/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java?rev=627192&r1=627191&r2=627192&view=diff
==============================================================================
--- velocity/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
(original)
+++ velocity/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
Tue Feb 12 16:03:43 2008
@@ -219,8 +219,8 @@
         datum.setValue("true");
         assertValid(datum);
 
-        // check that the default type is set
-        assertSame(datum.getType(), Data.DEFAULT_TYPE);
+        // check that the default type is "auto"
+        assertEquals(datum.getType(), "auto");
 
         // check that "true" auto-converted to boolean
         assertSame(datum.getConvertedValue(), Boolean.TRUE);



Mime
View raw message