A fix for jdbc regression test submitted yesterday by Kim Ho at Redhat

Barry Lind · Barry Lind · commit 618d56d09a27 · 2003-09-23T06:11:06.000Z
Modified Files:
 	ResultSetTest.java
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -229,10 +229,10 @@ public void testgetByte() throws Exception
 		
 		assertTrue(rs.next());
 		assertEquals(-1,rs.getByte(1));
-		int count = 3;
 		
 		while (rs.next())
 		{
+			thrown = false;
 			try
 			{
 				rs.getByte(1);
@@ -243,10 +243,7 @@ public void testgetByte() throws Exception
 			}
 			if (!thrown)
 				fail("Exception expected.");
-			count++;
 		}
-		if (count != 9)
-			fail("Exception expected.");
 	}
 		
        public void testgetShort() throws Exception
@@ -262,10 +259,10 @@ public void testgetShort() throws Exception
 		
 		assertTrue(rs.next());
 		assertEquals(-1,rs.getShort(1));
-		int count = 3;
 		
 		while (rs.next())
 		{
+			thrown = false;
 			try
 			{
 				rs.getShort(1);
@@ -276,10 +273,7 @@ public void testgetShort() throws Exception
 			}
 			if (!thrown)
 				fail("Exception expected.");
-			count++;
 		}
-		if (count != 9)
-			fail("Exception expected.");
 	}
        
 }

Original file line number	Diff line number	Diff line change
`@@ -229,10 +229,10 @@ public void testgetByte() throws Exception`
`229`	`229`
`230`	`230`	`assertTrue(rs.next());`
`231`	`231`	`assertEquals(-1,rs.getByte(1));`
`232`		`- int count = 3;`
`233`	`232`
`234`	`233`	`while (rs.next())`
`235`	`234`	`{`
	`235`	`+ thrown = false;`
`236`	`236`	`try`
`237`	`237`	`{`
`238`	`238`	`rs.getByte(1);`
`@@ -243,10 +243,7 @@ public void testgetByte() throws Exception`
`243`	`243`	`}`
`244`	`244`	`if (!thrown)`
`245`	`245`	`fail("Exception expected.");`
`246`		`- count++;`
`247`	`246`	`}`
`248`		`- if (count != 9)`
`249`		`- fail("Exception expected.");`
`250`	`247`	`}`
`251`	`248`
`252`	`249`	`public void testgetShort() throws Exception`
`@@ -262,10 +259,10 @@ public void testgetShort() throws Exception`
`262`	`259`
`263`	`260`	`assertTrue(rs.next());`
`264`	`261`	`assertEquals(-1,rs.getShort(1));`
`265`		`- int count = 3;`
`266`	`262`
`267`	`263`	`while (rs.next())`
`268`	`264`	`{`
	`265`	`+ thrown = false;`
`269`	`266`	`try`
`270`	`267`	`{`
`271`	`268`	`rs.getShort(1);`
`@@ -276,10 +273,7 @@ public void testgetShort() throws Exception`
`276`	`273`	`}`
`277`	`274`	`if (!thrown)`
`278`	`275`	`fail("Exception expected.");`
`279`		`- count++;`
`280`	`276`	`}`
`281`		`- if (count != 9)`
`282`		`- fail("Exception expected.");`
`283`	`277`	`}`
`284`	`278`
`285`	`279`	`}`