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

Jump to bottom

Un-mix TestNG Assert from JUnit Tests #626

Merged
merged 1 commit into from
Apr 15, 2022
Merged

Un-mix TestNG Assert from JUnit Tests #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...cator/src/test/java/org/glassfish/hk2/tests/locator/children/ChildServiceLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2019 Payara Services Ltd.
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to Eclipse Foundation. 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 @@ -21,7 +22,7 @@
import org.glassfish.hk2.api.ServiceLocatorState;
import org.glassfish.hk2.tests.locator.utilities.LocatorHelper;
import org.junit.Test;
import org.testng.Assert;
import org.junit.Assert;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/optional/NestedOptionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation.
* Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -20,7 +20,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.testng.Assert;
import org.junit.Assert;

/** @author Balthasar Schüss */
public class NestedOptionalTest {
Expand Down