You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2008/05/21 21:57:22 UTC
svn commit: r658832 - in /commons/proper/validator/trunk/src:
main/java/org/apache/commons/validator/
test/java/org/apache/commons/validator/
test/java/org/apache/commons/validator/routines/
test/java/org/apache/commons/validator/util/
Author: niallp
Date: Wed May 21 12:57:21 2008
New Revision: 658832
URL: http://svn.apache.org/viewvc?rev=658832&view=rev
Log:
Remove tabs
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/TypeBean.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValueBean.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/util/FlagsTest.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java Wed May 21 12:57:21 2008
@@ -88,7 +88,7 @@
* @return true if the email address is valid.
*/
public boolean isValid(String email) {
- return org.apache.commons.validator.routines.EmailValidator.getInstance().isValid(email);
+ return org.apache.commons.validator.routines.EmailValidator.getInstance().isValid(email);
}
/**
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractCommonTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractCommonTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractCommonTest.java Wed May 21 12:57:21 2008
@@ -52,8 +52,8 @@
resources = new ValidatorResources(in);
} finally {
if (in != null) {
- in.close();
- }
+ in.close();
+ }
}
}
}
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractNumberTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractNumberTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractNumberTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/AbstractNumberTest.java Wed May 21 12:57:21 2008
@@ -77,8 +77,8 @@
/**
* Utlity class to run a test on a value.
*
- * @param info Value to run test on.
- * @param passed Whether or not the test is expected to pass.
+ * @param info Value to run test on.
+ * @param passed Whether or not the test is expected to pass.
*/
protected void valueTest(Object info, boolean passed) throws ValidatorException {
// Construct validator based on the loaded resources
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java Wed May 21 12:57:21 2008
@@ -32,14 +32,14 @@
private static final String VALID_DISCOVER = "6011000990139424";
private static final String VALID_DINERS = "30569309025904";
- /**
- * Constructor for CreditCardValidatorTest.
- */
- public CreditCardValidatorTest(String name) {
- super(name);
- }
+ /**
+ * Constructor for CreditCardValidatorTest.
+ */
+ public CreditCardValidatorTest(String name) {
+ super(name);
+ }
- public void testIsValid() {
+ public void testIsValid() {
CreditCardValidator ccv = new CreditCardValidator();
assertFalse(ccv.isValid(null));
@@ -57,7 +57,7 @@
// disallow Visa so it should fail even with good number
ccv = new CreditCardValidator(CreditCardValidator.AMEX);
assertFalse(ccv.isValid("4417123456789113"));
- }
+ }
public void testAddAllowedCardType() {
CreditCardValidator ccv = new CreditCardValidator(CreditCardValidator.NONE);
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java Wed May 21 12:57:21 2008
@@ -101,8 +101,8 @@
/**
* Utlity class to run a test on a value.
*
- * @param info Value to run test on.
- * @param passed Whether or not the test is expected to pass.
+ * @param info Value to run test on.
+ * @param passed Whether or not the test is expected to pass.
*/
protected void valueTest(Object info, boolean passed) throws ValidatorException {
// Construct validator based on the loaded resources
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java Wed May 21 12:57:21 2008
@@ -408,8 +408,8 @@
/**
* Utlity class to run a test on a value.
*
- * @param info Value to run test on.
- * @param passed Whether or not the test is expected to pass.
+ * @param info Value to run test on.
+ * @param passed Whether or not the test is expected to pass.
*/
private void valueTest(ValueBean info, boolean passed) throws ValidatorException {
// Construct validator based on the loaded resources
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java Wed May 21 12:57:21 2008
@@ -91,18 +91,18 @@
* validator-extension.xml.
*/
protected void setUp() throws Exception {
- // Load resources
- InputStream in = null;
+ // Load resources
+ InputStream in = null;
- try {
- in = this.getClass().getResourceAsStream("ExtensionTest-config.xml");
- resources = new ValidatorResources(in);
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
+ try {
+ in = this.getClass().getResourceAsStream("ExtensionTest-config.xml");
+ resources = new ValidatorResources(in);
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
protected void tearDown() {
}
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java Wed May 21 12:57:21 2008
@@ -72,8 +72,8 @@
/**
* Checks if the field can be successfully converted to a <code>byte</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>byte</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -86,8 +86,8 @@
/**
* Checks if the field can be successfully converted to a <code>short</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>short</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -100,8 +100,8 @@
/**
* Checks if the field can be successfully converted to a <code>int</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>int</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -128,8 +128,8 @@
/**
* Checks if the field can be successfully converted to a <code>long</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>long</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -142,8 +142,8 @@
/**
* Checks if the field can be successfully converted to a <code>float</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>float</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -156,8 +156,8 @@
/**
* Checks if the field can be successfully converted to a <code>double</code>.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field can be successfully converted
+ * @param value The value validation is being performed on.
+ * @return boolean If the field can be successfully converted
* to a <code>double</code> <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
@@ -170,8 +170,8 @@
/**
* Checks if the field is an e-mail address.
*
- * @param value The value validation is being performed on.
- * @return boolean If the field is an e-mail address
+ * @param value The value validation is being performed on.
+ * @return boolean If the field is an e-mail address
* <code>true</code> is returned.
* Otherwise <code>false</code>.
*/
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/TypeBean.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/TypeBean.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/TypeBean.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/TypeBean.java Wed May 21 12:57:21 2008
@@ -34,67 +34,67 @@
private String sCreditCard = null;
public String getByte() {
- return sByte;
+ return sByte;
}
public void setByte(String sByte) {
- this.sByte = sByte;
+ this.sByte = sByte;
}
public String getShort() {
- return sShort;
+ return sShort;
}
public void setShort(String sShort) {
- this.sShort = sShort;
+ this.sShort = sShort;
}
public String getInteger() {
- return sInteger;
+ return sInteger;
}
public void setInteger(String sInteger) {
- this.sInteger = sInteger;
+ this.sInteger = sInteger;
}
public String getLong() {
- return sLong;
+ return sLong;
}
public void setLong(String sLong) {
- this.sLong = sLong;
+ this.sLong = sLong;
}
public String getFloat() {
- return sFloat;
+ return sFloat;
}
public void setFloat(String sFloat) {
- this.sFloat = sFloat;
+ this.sFloat = sFloat;
}
public String getDouble() {
- return sDouble;
+ return sDouble;
}
public void setDouble(String sDouble) {
- this.sDouble = sDouble;
+ this.sDouble = sDouble;
}
public String getDate() {
- return sDate;
+ return sDate;
}
public void setDate(String sDate) {
- this.sDate = sDate;
+ this.sDate = sDate;
}
public String getCreditCard() {
- return sCreditCard;
+ return sCreditCard;
}
public void setCreditCard(String sCreditCard) {
- this.sCreditCard = sCreditCard;
+ this.sCreditCard = sCreditCard;
}
-
-}
\ No newline at end of file
+
+}
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java Wed May 21 12:57:21 2008
@@ -48,14 +48,14 @@
}
public void testIsValid() {
- testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
- setUp();
- int options =
- UrlValidator.ALLOW_2_SLASHES
- + UrlValidator.ALLOW_ALL_SCHEMES
- + UrlValidator.NO_FRAGMENTS;
+ testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
+ setUp();
+ int options =
+ UrlValidator.ALLOW_2_SLASHES
+ + UrlValidator.ALLOW_ALL_SCHEMES
+ + UrlValidator.NO_FRAGMENTS;
- testIsValid(testUrlPartsOptions, options);
+ testIsValid(testUrlPartsOptions, options);
}
public void testIsValidScheme() {
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java Wed May 21 12:57:21 2008
@@ -69,10 +69,10 @@
* method being tested returns an object (<code>null</code> will be considered an error).
*/
public void testManualObject() {
- // property name of the method we are validating
- String property = "date";
- // name of ValidatorAction
- String action = "date";
+ // property name of the method we are validating
+ String property = "date";
+ // name of ValidatorAction
+ String action = "date";
ValidatorResources resources = setupDateResources(property, action);
TestBean bean = new TestBean();
@@ -118,24 +118,24 @@
}
public void testOnlyReturnErrors() throws ValidatorException {
- // property name of the method we are validating
- String property = "date";
- // name of ValidatorAction
- String action = "date";
- ValidatorResources resources = setupDateResources(property, action);
+ // property name of the method we are validating
+ String property = "date";
+ // name of ValidatorAction
+ String action = "date";
+ ValidatorResources resources = setupDateResources(property, action);
- TestBean bean = new TestBean();
- bean.setDate("2/3/1999");
+ TestBean bean = new TestBean();
+ bean.setDate("2/3/1999");
- Validator validator = new Validator(resources, "testForm");
- validator.setParameter(Validator.BEAN_PARAM, bean);
+ Validator validator = new Validator(resources, "testForm");
+ validator.setParameter(Validator.BEAN_PARAM, bean);
- ValidatorResults results = validator.validate();
+ ValidatorResults results = validator.validate();
- assertNotNull(results);
+ assertNotNull(results);
// Field passed and should be in results
- assertTrue(results.getPropertyNames().contains(property));
+ assertTrue(results.getPropertyNames().contains(property));
// Field passed but should not be in results
validator.setOnlyReturnErrors(true);
@@ -144,51 +144,51 @@
}
public void testOnlyValidateField() throws ValidatorException {
- // property name of the method we are validating
- String property = "date";
- // name of ValidatorAction
- String action = "date";
- ValidatorResources resources = setupDateResources(property, action);
+ // property name of the method we are validating
+ String property = "date";
+ // name of ValidatorAction
+ String action = "date";
+ ValidatorResources resources = setupDateResources(property, action);
- TestBean bean = new TestBean();
- bean.setDate("2/3/1999");
+ TestBean bean = new TestBean();
+ bean.setDate("2/3/1999");
- Validator validator = new Validator(resources, "testForm", property);
- validator.setParameter(Validator.BEAN_PARAM, bean);
+ Validator validator = new Validator(resources, "testForm", property);
+ validator.setParameter(Validator.BEAN_PARAM, bean);
- ValidatorResults results = validator.validate();
+ ValidatorResults results = validator.validate();
- assertNotNull(results);
+ assertNotNull(results);
// Field passed and should be in results
- assertTrue(results.getPropertyNames().contains(property));
+ assertTrue(results.getPropertyNames().contains(property));
}
private ValidatorResources setupDateResources(String property, String action) {
- ValidatorResources resources = new ValidatorResources();
+ ValidatorResources resources = new ValidatorResources();
- ValidatorAction va = new ValidatorAction();
- va.setName(action);
- va.setClassname("org.apache.commons.validator.ValidatorTest");
- va.setMethod("formatDate");
- va.setMethodParams("java.lang.Object,org.apache.commons.validator.Field");
-
- FormSet fs = new FormSet();
- Form form = new Form();
- form.setName("testForm");
- Field field = new Field();
- field.setProperty(property);
- field.setDepends(action);
- form.addField(field);
- fs.addForm(form);
-
- resources.addValidatorAction(va);
- resources.addFormSet(fs);
- resources.process();
+ ValidatorAction va = new ValidatorAction();
+ va.setName(action);
+ va.setClassname("org.apache.commons.validator.ValidatorTest");
+ va.setMethod("formatDate");
+ va.setMethodParams("java.lang.Object,org.apache.commons.validator.Field");
+
+ FormSet fs = new FormSet();
+ Form form = new Form();
+ form.setName("testForm");
+ Field field = new Field();
+ field.setProperty(property);
+ field.setDepends(action);
+ form.addField(field);
+ fs.addForm(form);
+
+ resources.addValidatorAction(va);
+ resources.addFormSet(fs);
+ resources.process();
- return resources;
+ return resources;
}
/**
@@ -286,7 +286,7 @@
}
return date;
- }
+ }
public class TestBean {
private String letter = null;
@@ -297,7 +297,7 @@
}
public void setLetter(String letter) {
- this.letter = letter;
+ this.letter = letter;
}
public String getDate() {
@@ -305,7 +305,7 @@
}
public void setDate(String date) {
- this.date = date;
+ this.date = date;
}
}
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValueBean.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValueBean.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValueBean.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValueBean.java Wed May 21 12:57:21 2008
@@ -29,14 +29,14 @@
* Gets the value.
*/
public String getValue() {
- return value;
+ return value;
}
/**
* Sets the value.
*/
public void setValue(String value) {
- this.value = value;
+ this.value = value;
}
}
\ No newline at end of file
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java Wed May 21 12:57:21 2008
@@ -50,14 +50,14 @@
}
public void testIsValid() {
- testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
- setUp();
- long options =
- UrlValidator.ALLOW_2_SLASHES
- + UrlValidator.ALLOW_ALL_SCHEMES
- + UrlValidator.NO_FRAGMENTS;
+ testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES);
+ setUp();
+ long options =
+ UrlValidator.ALLOW_2_SLASHES
+ + UrlValidator.ALLOW_ALL_SCHEMES
+ + UrlValidator.NO_FRAGMENTS;
- testIsValid(testUrlPartsOptions, options);
+ testIsValid(testUrlPartsOptions, options);
}
public void testIsValidScheme() {
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/util/FlagsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/util/FlagsTest.java?rev=658832&r1=658831&r2=658832&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/util/FlagsTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/util/FlagsTest.java Wed May 21 12:57:21 2008
@@ -25,54 +25,54 @@
*/
public class FlagsTest extends TestCase {
- /**
- * Declare some flags for testing.
- */
- private static final long LONG_FLAG = 1;
- private static final long LONG_FLAG_2 = 2;
- private static final int INT_FLAG = 4;
-
- /**
- * Constructor for FlagsTest.
- */
- public FlagsTest(String name) {
- super(name);
- }
-
- public void testHashCode() {
- Flags f = new Flags(45);
- assertEquals(f.hashCode(), 45);
- }
-
- public void testGetFlags() {
- Flags f = new Flags(45);
- assertEquals(f.getFlags(), 45);
- }
-
- public void testIsOnOff() {
- Flags f = new Flags();
- f.turnOn(LONG_FLAG);
- f.turnOn(INT_FLAG);
- assertTrue(f.isOn(LONG_FLAG));
- assertTrue(!f.isOff(LONG_FLAG));
-
- assertTrue(f.isOn(INT_FLAG));
- assertTrue(!f.isOff(INT_FLAG));
-
- assertTrue(f.isOff(LONG_FLAG_2));
- }
-
- public void testTurnOnOff() {
- }
-
- public void testTurnOff() {
- }
-
- public void testTurnOffAll() {
- Flags f = new Flags(98432);
- f.turnOffAll();
- assertEquals(0, f.getFlags());
- }
+ /**
+ * Declare some flags for testing.
+ */
+ private static final long LONG_FLAG = 1;
+ private static final long LONG_FLAG_2 = 2;
+ private static final int INT_FLAG = 4;
+
+ /**
+ * Constructor for FlagsTest.
+ */
+ public FlagsTest(String name) {
+ super(name);
+ }
+
+ public void testHashCode() {
+ Flags f = new Flags(45);
+ assertEquals(f.hashCode(), 45);
+ }
+
+ public void testGetFlags() {
+ Flags f = new Flags(45);
+ assertEquals(f.getFlags(), 45);
+ }
+
+ public void testIsOnOff() {
+ Flags f = new Flags();
+ f.turnOn(LONG_FLAG);
+ f.turnOn(INT_FLAG);
+ assertTrue(f.isOn(LONG_FLAG));
+ assertTrue(!f.isOff(LONG_FLAG));
+
+ assertTrue(f.isOn(INT_FLAG));
+ assertTrue(!f.isOff(INT_FLAG));
+
+ assertTrue(f.isOff(LONG_FLAG_2));
+ }
+
+ public void testTurnOnOff() {
+ }
+
+ public void testTurnOff() {
+ }
+
+ public void testTurnOffAll() {
+ Flags f = new Flags(98432);
+ f.turnOffAll();
+ assertEquals(0, f.getFlags());
+ }
public void testClear() {
Flags f = new Flags(98432);
@@ -80,39 +80,39 @@
assertEquals(0, f.getFlags());
}
- public void testTurnOnAll() {
- Flags f = new Flags();
- f.turnOnAll();
- assertEquals(Long.MAX_VALUE, f.getFlags());
- }
-
- /**
- * Test for Object clone()
- */
- public void testClone() {
- }
-
- /**
- * Test for boolean equals(Object)
- */
- public void testEqualsObject() {
- }
-
- /**
- * Test for String toString()
- */
- public void testToString() {
- Flags f = new Flags();
- String s = f.toString();
- assertEquals(64, s.length());
-
- f.turnOn(INT_FLAG);
- s = f.toString();
- assertEquals(64, s.length());
-
- assertEquals(
- "0000000000000000000000000000000000000000000000000000000000000100",
- s);
- }
+ public void testTurnOnAll() {
+ Flags f = new Flags();
+ f.turnOnAll();
+ assertEquals(Long.MAX_VALUE, f.getFlags());
+ }
+
+ /**
+ * Test for Object clone()
+ */
+ public void testClone() {
+ }
+
+ /**
+ * Test for boolean equals(Object)
+ */
+ public void testEqualsObject() {
+ }
+
+ /**
+ * Test for String toString()
+ */
+ public void testToString() {
+ Flags f = new Flags();
+ String s = f.toString();
+ assertEquals(64, s.length());
+
+ f.turnOn(INT_FLAG);
+ s = f.toString();
+ assertEquals(64, s.length());
+
+ assertEquals(
+ "0000000000000000000000000000000000000000000000000000000000000100",
+ s);
+ }
}