litesoft

URLs

Explore

Commits

Diff Revisions 829 vs 830 for /trunk/Java/KeyHole/tests/org/litesoft/aokeyhole/swing/mains/mementobeans/BeanReaderTest.java

		@@ -6,6 +6,7 @@
6	6		import junit.framework.*;
7	7
8	8		import org.litesoft.*;
	9	+	import org.litesoft.aokeyhole.swing.mains.mementobeans.support.*;
9	10
10	11		public class BeanReaderTest extends TestCasePlus
11	12		{
		@@ -34,11 +35,11 @@
34	35		List<AttributeData> zAttributes = zReader.getAttributeDatas();
35	36		assertEquals( zAttributes.toString(), 3, zAttributes.size() );
36	37
37		-	assertAttributeData( zAttributes, 0, "String", "FirstName", false, false, false,
	38	+	assertAttributeData( zAttributes, 0, "String", "FirstName", NullFlags.none(), false,
38	39		"First Name of the Primary Contact" );
39		-	assertAttributeData( zAttributes, 1, "String", "LastName", false, false, false );
	40	+	assertAttributeData( zAttributes, 1, "String", "LastName", NullFlags.none(), false );
40	41
41		-	assertAttributeData( zAttributes, 2, "String", "JobTitle", false, false, false,
	42	+	assertAttributeData( zAttributes, 2, "String", "JobTitle", NullFlags.none(), false,
42	43		"Job Title for the Primary Contact person",
43	44		"(the owner/possessor of this device)." );
44	45		}
		@@ -51,17 +52,19 @@
51	52		assertEquals( "MasterBean", zReader.getName() );
52	53		assertArraysAreEqual( zReader.getNotes(), "The Master (from Master/Detail) Data to demonstrate the support for the \"Memento\" pattern." );
53	54		List<AttributeData> zAttributes = zReader.getAttributeDatas();
54		-	assertEquals( zAttributes.toString(), 5, zAttributes.size() );
	55	+	assertEquals( zAttributes.toString(), 6, zAttributes.size() );
55	56
56		-	assertAttributeData( zAttributes, 0, "String", "Name", true, false, false );
	57	+	assertAttributeData( zAttributes, 0, "String", "Name", NullFlags.empties(), false );
57	58
58		-	assertAttributeData( zAttributes, 1, "String", null, false, false, false );
	59	+	assertAttributeData( zAttributes, 1, "String", null, NullFlags.none(), false );
59	60
60		-	assertAttributeData( zAttributes, 2, "String", "Description", true, false, true );
	61	+	assertAttributeData( zAttributes, 2, "String", "Description", NullFlags.empties(), true );
61	62
62		-	assertAttributeData( zAttributes, 3, "DetailBean", "SpecialDetail", true, false, false );
	63	+	assertAttributeData( zAttributes, 3, "DetailBean", "SpecialDetail", NullFlags.empties(), false );
63	64
64		-	assertAttributeData( zAttributes, 4, "DetailBean", "Details", true, false, true );
	65	+	assertAttributeData( zAttributes, 4, "DetailBean", "Details", NullFlags.empties(), true );
	66	+
	67	+	assertAttributeData( zAttributes, 5, "Boolean", "Active", NullFlags.falses(), false );
65	68		}
66	69
67	70		public void test_DetailBeanRead()
		@@ -74,20 +77,67 @@
74	77		List<AttributeData> zAttributes = zReader.getAttributeDatas();
75	78		assertEquals( zAttributes.toString(), 2, zAttributes.size() );
76	79
77		-	assertAttributeData( zAttributes, 0, "String", "Item", true, false, false );
	80	+	assertAttributeData( zAttributes, 0, "String", "Item", NullFlags.empties(), false );
	81	+
	82	+	assertAttributeData( zAttributes, 1, "Integer", "Quantity", NullFlags.zeros(), false );
	83	+	}
	84	+
	85	+	private static class NullFlags
	86	+	{
	87	+	boolean mEmpties, mZeros, mFalses;
78	88
79		-	assertAttributeData( zAttributes, 1, "Integer", "Quantity", false, true, false );
	89	+	public boolean isEmpties()
	90	+	{
	91	+	return mEmpties;
	92	+	}
	93	+
	94	+	public boolean isZeros()
	95	+	{
	96	+	return mZeros;
	97	+	}
	98	+
	99	+	public boolean isFalses()
	100	+	{
	101	+	return mFalses;
	102	+	}
	103	+
	104	+	public static NullFlags empties()
	105	+	{
	106	+	NullFlags flags = new NullFlags();
	107	+	flags.mEmpties = true;
	108	+	return flags;
	109	+	}
	110	+
	111	+	public static NullFlags zeros()
	112	+	{
	113	+	NullFlags flags = new NullFlags();
	114	+	flags.mZeros = true;
	115	+	return flags;
	116	+	}
	117	+
	118	+	public static NullFlags falses()
	119	+	{
	120	+	NullFlags flags = new NullFlags();
	121	+	flags.mFalses = true;
	122	+	return flags;
	123	+	}
	124	+
	125	+	public static NullFlags none()
	126	+	{
	127	+	return new NullFlags();
	128	+	}
80	129		}
81	130
82	131		private void assertAttributeData( List<AttributeData> pAttributes, int pID, String pType, String pName,
83		-	boolean pNullEmpties, boolean pNullZeros, boolean pRepeating, String... pNotes )
	132	+	NullFlags pNullFlags, boolean pRepeating, String... pNotes )
84	133		{
85	134		AttributeData zAttribute = pAttributes.get( pID );
86	135		assertEquals( pID, zAttribute.getID() );
87	136		assertEquals( pType, zAttribute.getType() );
88	137		assertEquals( pName, zAttribute.getName() );
89		-	assertEquals( pNullEmpties, zAttribute.isNullEmpties() );
90		-	assertEquals( pNullZeros, zAttribute.isNullZeros() );
	138	+	assertEquals( pNullFlags.isEmpties(), zAttribute.isNullEmpties() );
	139	+	assertEquals( pNullFlags.isZeros(), zAttribute.isNullZeros() );
	140	+	assertEquals( pNullFlags.isFalses(), zAttribute.isNullFalses() );
91	141		assertEquals( pRepeating, zAttribute.isRepeating() );
92	142		assertArraysAreEqual( zAttribute.getNotes(), pNotes );
93	143		}

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/KeyHole/tests/org/litesoft/aokeyhole/swing/mains/mementobeans/BeanReaderTest.java