Skip to content

Fix flaky 2 #5775

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

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Fix flaky 2 #5775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2193b2b
Fixed flaky test in DisposableSupplierText.java with set comparison
mumbler6 Oct 21, 2024
ee210e0
Fixed duplicate flaky test in other file path
mumbler6 Oct 22, 2024
5626583
fixed copyright
mumbler6 Oct 22, 2024
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
18 changes: 14 additions & 4 deletions inject/cdi2-se/src/test/java/org/glassfish/jersey/inject/cdi/se/DisposableSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -17,6 +17,8 @@
package org.glassfish.jersey.inject.cdi.se;

import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
Expand Down Expand Up @@ -368,9 +370,17 @@ public void testDisposeComposedObjectWithPerLookupFields() {

// All instances should be the same because they are request scoped.
ComposedObject instance = injectionManager.getInstance(ComposedObject.class);
assertEquals("1", instance.getFirst());
assertEquals("2", instance.getSecond());
assertEquals("3", instance.getThird());
Set<String> set1 = new HashSet<String>() {{
add("1");
add("2");
add("3");
}};
Set<String> set2 = new HashSet<String>() {{
add(instance.getFirst().toString());
add(instance.getSecond().toString());
add(instance.getThird().toString());
}};
assertEquals(set1, set2);
});

Supplier<String> cleanedSupplier = atomicSupplier.get();
Expand Down
18 changes: 14 additions & 4 deletions inject/hk2/src/test/java/org/glassfish/jersey/inject/hk2/DisposableSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -17,6 +17,8 @@
package org.glassfish.jersey.inject.hk2;

import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
Expand Down Expand Up @@ -374,9 +376,17 @@ public void testDisposeComposedObjectWithPerLookupFields() {

// All instances should be the same because they are request scoped.
ComposedObject instance = injectionManager.getInstance(ComposedObject.class);
assertEquals("1", instance.first);
assertEquals("2", instance.second);
assertEquals("3", instance.third);
Set<String> set1 = new HashSet<String>() {{
add("1");
add("2");
add("3");
}};
Set<String> set2 = new HashSet<String>() {{
add(instance.first.toString());
add(instance.second.toString());
add(instance.third.toString());
}};
assertEquals(set1, set2);
});

Supplier<String> cleanedSupplier = atomicSupplier.get();
Expand Down