jmitchell 2003/03/23 06:50:22 Modified: web/test/test/org/apache/struts/taglib/html TestLinkTag1.jsp TestLinkTag2.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp Log: Fix a bit of some bad logic Revision Changes Path 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp Index: TestLinkTag1.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag1.jsp 14 Mar 2003 01:20:19 -0000 1.1 +++ TestLinkTag1.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -303,7 +303,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp Index: TestLinkTag2.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag2.jsp 14 Mar 2003 01:20:19 -0000 1.1 +++ TestLinkTag2.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -288,7 +288,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp Index: TestLinkTag3.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag3.jsp 14 Mar 2003 01:20:33 -0000 1.1 +++ TestLinkTag3.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -305,7 +305,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp Index: TestLinkTag4.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag4.jsp 14 Mar 2003 01:20:33 -0000 1.1 +++ TestLinkTag4.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -289,7 +289,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp Index: TestLinkTag5.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag5.jsp 14 Mar 2003 01:20:55 -0000 1.1 +++ TestLinkTag5.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -304,7 +304,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp Index: TestLinkTag6.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag6.jsp 14 Mar 2003 01:20:55 -0000 1.1 +++ TestLinkTag6.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -289,7 +289,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp Index: TestLinkTag7.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag7.jsp 14 Mar 2003 01:20:55 -0000 1.1 +++ TestLinkTag7.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -304,7 +304,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); } 1.2 +1 -1 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp Index: TestLinkTag8.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkTag8.jsp 14 Mar 2003 01:20:55 -0000 1.1 +++ TestLinkTag8.jsp 23 Mar 2003 14:50:22 -0000 1.2 @@ -289,7 +289,7 @@ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS"); String compareTo = (String) pageContext.getAttribute("TEST_RESULTS"); -if ((expected == null) || (expected == null)){ +if ((expected == null) || (compareTo == null)){ Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly."); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]