Attachment #202173 for bug #183164

View | Details | Raw Unified | Return to bug 183164 | Differences between

and this patch




	private void doTestOrient(STextTypeHandler handler, String label, String data, String resLTR, String resRTL, String resCon) {
		String full, lean;

		ISTextExpert expertLTR = STextExpertFactory.getStatefulExpert(handler, envLTR);
		ISTextExpert expertRTL = STextExpertFactory.getStatefulExpert(handler, envRTL);
		ISTextExpert expertCRL = STextExpertFactory.getStatefulExpert(handler, envCRL);

		lean = toUT16(data);
		full = expertLTR.leanToFullText(lean);

	private void doTestDirection() {
		String data, lean, full, model;
		int dirA, dirH;
		ISTextExpert expertRL = STextExpertFactory.getStatefulExpert(testMyCommaRL, envLTR);
		dirA = expertRL.getTextDirection(toUT16("###"));
		dirH = expertRL.getTextDirection(toUT16("ABC"));
		assertTrue("TestDirection #1", dirA == RTL && dirH == LTR);

		ISTextExpert expertRR = STextExpertFactory.getStatefulExpert(testMyCommaRR, envLTR);
		dirA = expertRR.getTextDirection(toUT16("###"));
		dirH = expertRR.getTextDirection(toUT16("ABC"));
		assertTrue("TestDirection #2", dirA == RTL && dirH == RTL);

		ISTextExpert expertLL = STextExpertFactory.getStatefulExpert(testMyCommaLL, envLTR);
		lean = toUT16("ABC,#DEF,HOST,com");
		full = expertLL.leanToFullText(lean);
		assertEquals("TestDirection #9 full", "ABC@,#DEF@,HOST,com", toPseudo(full));

		assertEquals("TestDirection #10 full", "ABC@,DEF@,HOST,com", toPseudo(full));

		STextEnvironment environment = new STextEnvironment(null, true, STextEnvironment.ORIENT_LTR);
		ISTextExpert expert = STextExpertFactory.getStatefulExpert(testMyCommaRL, environment);
		dirA = expert.getTextDirection(toUT16("###"));
		dirH = expert.getTextDirection(toUT16("ABC"));
		assertTrue("TestDirection #10.5", dirA == RTL && dirH == LTR);


		data = "ABc,|#DEF,HOST,com";
		lean = toUT16(data);
		expert = STextExpertFactory.getStatefulExpert(testMyCommaRL, envRTLMIR);
		full = expert.leanToFullText(lean);
		model = "ABc,|#DEF,HOST,com";
		assertEquals("TestDirection #17 full", model, toPseudo(full));




		assertTrue(env2.isProcessingNeeded());

		STextTypeHandler handler1 = new TestHandler1();
		ISTextExpert expert1 = STextExpertFactory.getStatefulExpert(handler1, env1);
		String full = expert1.leanToFullText("abcd");
		assertEquals("@a@b@c@d", toPseudo(full));

		STextTypeHandler handler2 = new TestHandler2();
		ISTextExpert expert2 = STextExpertFactory.getStatefulExpert(handler2, env1);
		boolean catchFlag = false;
		try {
			full = expert2.leanToFullText("abcd");

		assertTrue("Catch missing indexOfSpecial", catchFlag);

		STextTypeHandler handler3 = new TestHandler3();
		ISTextExpert expert3 = STextExpertFactory.getStatefulExpert(handler3, env1);
		catchFlag = false;
		try {
			full = expert3.leanToFullText("abcd");

Return to bug 183164

Lines 132-140 Link Here

(-)src/org/eclipse/equinox/bidi/internal/tests/STextMethodsTest.java (-8 / +8 lines)
132	private void doTestOrient(STextTypeHandler handler, String label, String data, String resLTR, String resRTL, String resCon) {	132	private void doTestOrient(STextTypeHandler handler, String label, String data, String resLTR, String resRTL, String resCon) {
133	String full, lean;	133	String full, lean;
134		134
135	ISTextExpert expertLTR = STextExpertFactory.getExpert(handler, envLTR);	135	ISTextExpert expertLTR = STextExpertFactory.getStatefulExpert(handler, envLTR);
136	ISTextExpert expertRTL = STextExpertFactory.getExpert(handler, envRTL);	136	ISTextExpert expertRTL = STextExpertFactory.getStatefulExpert(handler, envRTL);
137	ISTextExpert expertCRL = STextExpertFactory.getExpert(handler, envCRL);	137	ISTextExpert expertCRL = STextExpertFactory.getStatefulExpert(handler, envCRL);
138		138
139	lean = toUT16(data);	139	lean = toUT16(data);
140	full = expertLTR.leanToFullText(lean);	140	full = expertLTR.leanToFullText(lean);
Lines 205-221 Link Here
205	private void doTestDirection() {	205	private void doTestDirection() {
206	String data, lean, full, model;	206	String data, lean, full, model;
207	int dirA, dirH;	207	int dirA, dirH;
208	ISTextExpert expertRL = STextExpertFactory.getExpert(testMyCommaRL, envLTR);	208	ISTextExpert expertRL = STextExpertFactory.getStatefulExpert(testMyCommaRL, envLTR);
209	dirA = expertRL.getTextDirection(toUT16("###"));	209	dirA = expertRL.getTextDirection(toUT16("###"));
210	dirH = expertRL.getTextDirection(toUT16("ABC"));	210	dirH = expertRL.getTextDirection(toUT16("ABC"));
211	assertTrue("TestDirection #1", dirA == RTL && dirH == LTR);	211	assertTrue("TestDirection #1", dirA == RTL && dirH == LTR);
212		212
213	ISTextExpert expertRR = STextExpertFactory.getExpert(testMyCommaRR, envLTR);	213	ISTextExpert expertRR = STextExpertFactory.getStatefulExpert(testMyCommaRR, envLTR);
214	dirA = expertRR.getTextDirection(toUT16("###"));	214	dirA = expertRR.getTextDirection(toUT16("###"));
215	dirH = expertRR.getTextDirection(toUT16("ABC"));	215	dirH = expertRR.getTextDirection(toUT16("ABC"));
216	assertTrue("TestDirection #2", dirA == RTL && dirH == RTL);	216	assertTrue("TestDirection #2", dirA == RTL && dirH == RTL);
217		217
218	ISTextExpert expertLL = STextExpertFactory.getExpert(testMyCommaLL, envLTR);	218	ISTextExpert expertLL = STextExpertFactory.getStatefulExpert(testMyCommaLL, envLTR);
219	lean = toUT16("ABC,#DEF,HOST,com");	219	lean = toUT16("ABC,#DEF,HOST,com");
220	full = expertLL.leanToFullText(lean);	220	full = expertLL.leanToFullText(lean);
221	assertEquals("TestDirection #9 full", "ABC@,#DEF@,HOST,com", toPseudo(full));	221	assertEquals("TestDirection #9 full", "ABC@,#DEF@,HOST,com", toPseudo(full));
Lines 226-232 Link Here
226	assertEquals("TestDirection #10 full", "ABC@,DEF@,HOST,com", toPseudo(full));	226	assertEquals("TestDirection #10 full", "ABC@,DEF@,HOST,com", toPseudo(full));
227		227
228	STextEnvironment environment = new STextEnvironment(null, true, STextEnvironment.ORIENT_LTR);	228	STextEnvironment environment = new STextEnvironment(null, true, STextEnvironment.ORIENT_LTR);
229	ISTextExpert expert = STextExpertFactory.getExpert(testMyCommaRL, environment);	229	ISTextExpert expert = STextExpertFactory.getStatefulExpert(testMyCommaRL, environment);
230	dirA = expert.getTextDirection(toUT16("###"));	230	dirA = expert.getTextDirection(toUT16("###"));
231	dirH = expert.getTextDirection(toUT16("ABC"));	231	dirH = expert.getTextDirection(toUT16("ABC"));
232	assertTrue("TestDirection #10.5", dirA == RTL && dirH == LTR);	232	assertTrue("TestDirection #10.5", dirA == RTL && dirH == LTR);
Lines 268-274 Link Here
268		268
269	data = "ABc,\|#DEF,HOST,com";	269	data = "ABc,\|#DEF,HOST,com";
270	lean = toUT16(data);	270	lean = toUT16(data);
271	expert = STextExpertFactory.getExpert(testMyCommaRL, envRTLMIR);	271	expert = STextExpertFactory.getStatefulExpert(testMyCommaRL, envRTLMIR);
272	full = expert.leanToFullText(lean);	272	full = expert.leanToFullText(lean);
273	model = "ABc,\|#DEF,HOST,com";	273	model = "ABc,\|#DEF,HOST,com";
274	assertEquals("TestDirection #17 full", model, toPseudo(full));	274	assertEquals("TestDirection #17 full", model, toPseudo(full));

Lines 77-88 Link Here

(-)src/org/eclipse/equinox/bidi/internal/tests/STextSomeMoreTest.java (-3 / +3 lines)
77	assertTrue(env2.isProcessingNeeded());	77	assertTrue(env2.isProcessingNeeded());
78		78
79	STextTypeHandler handler1 = new TestHandler1();	79	STextTypeHandler handler1 = new TestHandler1();
80	ISTextExpert expert1 = STextExpertFactory.getExpert(handler1, env1);	80	ISTextExpert expert1 = STextExpertFactory.getStatefulExpert(handler1, env1);
81	String full = expert1.leanToFullText("abcd");	81	String full = expert1.leanToFullText("abcd");
82	assertEquals("@a@b@c@d", toPseudo(full));	82	assertEquals("@a@b@c@d", toPseudo(full));
83		83
84	STextTypeHandler handler2 = new TestHandler2();	84	STextTypeHandler handler2 = new TestHandler2();
85	ISTextExpert expert2 = STextExpertFactory.getExpert(handler2, env1);	85	ISTextExpert expert2 = STextExpertFactory.getStatefulExpert(handler2, env1);
86	boolean catchFlag = false;	86	boolean catchFlag = false;
87	try {	87	try {
88	full = expert2.leanToFullText("abcd");	88	full = expert2.leanToFullText("abcd");
Lines 92-98 Link Here
92	assertTrue("Catch missing indexOfSpecial", catchFlag);	92	assertTrue("Catch missing indexOfSpecial", catchFlag);
93		93
94	STextTypeHandler handler3 = new TestHandler3();	94	STextTypeHandler handler3 = new TestHandler3();
95	ISTextExpert expert3 = STextExpertFactory.getExpert(handler3, env1);	95	ISTextExpert expert3 = STextExpertFactory.getStatefulExpert(handler3, env1);
96	catchFlag = false;	96	catchFlag = false;
97	try {	97	try {
98	full = expert3.leanToFullText("abcd");	98	full = expert3.leanToFullText("abcd");