Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for intermittent failures in JUnit tests - LobsTest #827

Merged
merged 6 commits into from
Oct 26, 2018
Merged

Fix for intermittent failures in JUnit tests - LobsTest #827

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3de0d66
removing sql error code check as it's not used consistently in the dr…
rene-ye Oct 9, 2018
55bd38c
fixed nvarchar having an odd number of bytes
rene-ye Oct 9, 2018
1aa3c92
added comment explaining why we need an even number
rene-ye Oct 11, 2018
f0af67a
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into in…
rene-ye Oct 22, 2018
354735b
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into in…
rene-ye Oct 25, 2018
9cc7d4b
removing 'even number' logic as it's not tied with LoB type. Test sho…
rene-ye Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/test/java/com/microsoft/sqlserver/jdbc/unit/lobs/lobsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ private void testInvalidLobs(Class lobClass, boolean isResultSet) throws SQLExce
datasize = packetSize;
break;
case 1:
datasize = packetSize + ThreadLocalRandom.current().nextInt(packetSize) + 1;
//NClobs are always 2 bytes per character, generate an even number only
datasize = packetSize + (ThreadLocalRandom.current().nextInt(packetSize/2) * 2);
break;
default:
datasize = packetSize - ThreadLocalRandom.current().nextInt(packetSize);
Expand Down Expand Up @@ -207,11 +208,7 @@ else if (lobClass == Blob.class)
}
if (!verified) {
// Odd CharacterStream length will throw this exception
if (!e.getMessage().contains(TestResource.getResource("R_badStreamLength")))

{
if (lobClass == DBCharacterStream.class || lobClass == DBBinaryStream.class)
assertTrue(e.getSQLState() != null, TestResource.getResource("R_SQLStateNull"));
if (!e.getMessage().contains(TestResource.getResource("R_badStreamLength"))) {
assertTrue(e.getMessage().contains(TestResource.getResource("R_streamReadError")));
}

Expand Down