diff --git a/src/tests/kits/interface/balert/AlertTest.cpp b/src/tests/kits/interface/balert/AlertTest.cpp
index 9e1b447473..6e5d6465f4 100644
--- a/src/tests/kits/interface/balert/AlertTest.cpp
+++ b/src/tests/kits/interface/balert/AlertTest.cpp
@@ -255,6 +255,11 @@ AlertTest::Suite()
 	AT_ADDTEST(twentyX_60X_LW_ES_IA);
 	AT_ADDTEST(fortyX_60X_LW_ES_IA);
 	
+	////// WW_ES_IA - One Button //////
+	AT_ADDTEST(empty_empty_WW_ES_IA);
+	AT_ADDTEST(OK_X_WW_ES_IA);
+	AT_ADDTEST(twentyX_60X_WW_ES_IA);
+	
 	////// UW_ES_EA - One Button //////
 	AT_ADDTEST(OK_X_UW_ES_EA);
 	AT_ADDTEST(fortyX_60X_UW_ES_EA);
@@ -268,6 +273,12 @@ AlertTest::Suite()
 	AT_ADDTEST(empty_empty_X_LW_ES_IA);
 	AT_ADDTEST(OK_Cancel_60X_LW_ES_IA);
 	
+	////// WW_ES_IA - Two Button //////
+	AT_ADDTEST(empty_empty_X_WW_ES_IA);
+	AT_ADDTEST(OK_Cancel_60X_WW_ES_IA);
+	AT_ADDTEST(twentyX_Cancel_60X_WW_ES_IA);
+	AT_ADDTEST(twentyX_20X_WW_ES_IA);
+	
 	////// UW_ES_EA - Two Button //////
 	AT_ADDTEST(OK_Cancel_60X_UW_ES_EA);
 	AT_ADDTEST(twentyX_20X_60X_UW_ES_EA);
@@ -280,6 +291,13 @@ AlertTest::Suite()
 	AT_ADDTEST(Yes_No_Cancel_X_LW_ES_IA);
 	AT_ADDTEST(twentyX_20X_20X_60X_LW_ES_IA);
 	
+	////// WW_ES_IA - Three Button //////
+	AT_ADDTEST(empty_empty_empty_X_WW_ES_IA);
+	AT_ADDTEST(Monkey_Dog_Cat_X_WW_ES_IA);
+	AT_ADDTEST(X_20X_X_WW_ES_IA);
+	AT_ADDTEST(Yes_No_Cancel_X_WW_ES_IA);
+	AT_ADDTEST(twentyX_20X_20X_60X_WW_ES_IA);
+	
 	////// UW_ES_EA - Three Button //////
 	AT_ADDTEST(twentyX_20X_20X_60X_UW_ES_EA);
 		
@@ -565,6 +583,92 @@ AlertTest::fortyX_60X_LW_ES_IA()
 	ati.GuiInfoTest();
 }
 
+////// WW_ES_IA - One Button //////
+
+void
+AlertTest::empty_empty_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(284.0f, 28.0f);
+	ati.SetButtonInfo(0, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void
+AlertTest::OK_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "OK";
+	bi.width = 35.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(269.0f, 28.0f);
+	ati.SetButtonInfo(0, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void
+AlertTest::twentyX_60X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 77.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = k60X;
+	ti.width = 245.0f;
+	ti.height = 26.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(144.0f, 41.0f);
+	ati.SetButtonInfo(0, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
 ////// UW_ES_EA - One Button //////
 
 void
@@ -799,6 +903,139 @@ AlertTest::OK_Cancel_60X_LW_ES_IA()
 	ati.GuiInfoTest();
 }
 
+////// WW_ES_IA - Two Button //////
+
+void
+AlertTest::empty_empty_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(258.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(284.0f, 28.0f);
+	ati.SetButtonInfo(1, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void
+AlertTest::OK_Cancel_60X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 77.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = k60X;
+	ti.width = 245.0f;
+	ti.height = 26.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "OK";
+	bi.width = 52.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(194.0f, 44.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "Cancel";
+	bi.width = 52.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(252.0f, 41.0f);
+	ati.SetButtonInfo(1, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void
+AlertTest::twentyX_Cancel_60X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 394.0f;
+	wi.height = 77.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = k60X;
+	ti.width = 329.0f;
+	ti.height = 26.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(62.0f, 44.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "Cancel";
+	bi.width = 160.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(228.0f, 41.0f);
+	ati.SetButtonInfo(1, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void 
+AlertTest::twentyX_20X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 394.0f;
+	wi.height = 77.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = k60X;
+	ti.width = 329.0f;
+	ti.height = 26.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(62.0f, 44.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(228.0f, 41.0f);
+	ati.SetButtonInfo(1, bi);
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
 
 ////// UW_ES_EA - Two Button //////
 
@@ -1031,6 +1268,199 @@ AlertTest::twentyX_20X_20X_60X_LW_ES_IA()
 	ati.GuiInfoTest();
 }
 
+////// WW_ES_IA - Three Button //////
+
+void 
+AlertTest::empty_empty_empty_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(229.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(258.0f, 31.0f);
+	ati.SetButtonInfo(1, bi);
+	bi.label = "";
+	bi.width = 20.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(284.0f, 28.0f);
+	ati.SetButtonInfo(2, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void 
+AlertTest::Monkey_Dog_Cat_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "Monkey";
+	bi.width = 56.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(121.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "Dog";
+	bi.width = 56.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(186.0f, 31.0f);
+	ati.SetButtonInfo(1, bi);
+	bi.label = "Cat";
+	bi.width = 56.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(248.0f, 28.0f);
+	ati.SetButtonInfo(2, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void 
+AlertTest::X_20X_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 563.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 498.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "X";
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(62.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(231.0f, 31.0f);
+	ati.SetButtonInfo(1, bi);
+	bi.label = "X";
+	bi.width = 160.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(397.0f, 28.0f);
+	ati.SetButtonInfo(2, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void 
+AlertTest::Yes_No_Cancel_X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 310.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = "X";
+	ti.width = 245.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = "Yes";
+	bi.width = 52.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(133.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = "No";
+	bi.width = 52.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(194.0f, 31.0f);
+	ati.SetButtonInfo(1, bi);
+	bi.label = "Cancel";
+	bi.width = 52.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(252.0f, 28.0f);
+	ati.SetButtonInfo(2, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+void 
+AlertTest::twentyX_20X_20X_60X_WW_ES_IA()
+{
+	AlertTestInfo ati(this);
+	GuiInfo wi, ti, bi;
+	wi.width = 563.0f;
+	wi.height = 64.0f;
+	ati.SetWinInfo(wi);
+	
+	ti.label = k60X;
+	ti.width = 498.0f;
+	ti.height = 13.0f;
+	ti.topleft.Set(55.0f, 6.0f);
+	ati.SetTextViewInfo(ti);
+	
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(62.0f, 31.0f);
+	ati.SetButtonInfo(0, bi);
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 24.0f;
+	bi.topleft.Set(231.0f, 31.0f);
+	ati.SetButtonInfo(1, bi);
+	bi.label = k20X;
+	bi.width = 160.0f;
+	bi.height = 30.0f;
+	bi.topleft.Set(397.0f, 28.0f);
+	ati.SetButtonInfo(2, bi); 
+	
+	ati.SetButtonWidthMode(B_WIDTH_FROM_WIDEST);
+	ati.SetButtonSpacingMode(B_EVEN_SPACING);
+	ati.SetAlertType(B_INFO_ALERT);
+	
+	ati.GuiInfoTest();
+}
+
+
 ////// UW_ES_EA - Three Button //////
 
 void
diff --git a/src/tests/kits/interface/balert/AlertTest.h b/src/tests/kits/interface/balert/AlertTest.h
index d51c4297d6..c9f82e291d 100644
--- a/src/tests/kits/interface/balert/AlertTest.h
+++ b/src/tests/kits/interface/balert/AlertTest.h
@@ -58,6 +58,11 @@ public:
 	void twentyX_60X_LW_ES_IA();
 	void fortyX_60X_LW_ES_IA();
 	
+	////// WW_ES_IA - One Button //////
+	void empty_empty_WW_ES_IA();
+	void OK_X_WW_ES_IA();
+	void twentyX_60X_WW_ES_IA();
+	
 	////// UW_ES_EA - One Button //////
 	void OK_X_UW_ES_EA();
 	void fortyX_60X_UW_ES_EA();
@@ -71,6 +76,12 @@ public:
 	void empty_empty_X_LW_ES_IA();
 	void OK_Cancel_60X_LW_ES_IA();
 	
+	////// WW_ES_IA - Two Button //////
+	void empty_empty_X_WW_ES_IA();
+	void OK_Cancel_60X_WW_ES_IA();
+	void twentyX_Cancel_60X_WW_ES_IA();
+	void twentyX_20X_WW_ES_IA();
+	
 	////// UW_ES_EA - Two Button //////
 	void OK_Cancel_60X_UW_ES_EA();
 	void twentyX_20X_60X_UW_ES_EA();
@@ -83,6 +94,13 @@ public:
 	void Yes_No_Cancel_X_LW_ES_IA();
 	void twentyX_20X_20X_60X_LW_ES_IA();
 	
+	////// WW_ES_IA - Three Button //////
+	void empty_empty_empty_X_WW_ES_IA();
+	void Monkey_Dog_Cat_X_WW_ES_IA();
+	void X_20X_X_WW_ES_IA();
+	void Yes_No_Cancel_X_WW_ES_IA();
+	void twentyX_20X_20X_60X_WW_ES_IA();
+	
 	////// UW_ES_EA - Three Button //////
 	void twentyX_20X_20X_60X_UW_ES_EA();
 };