Skip to content

Trigger CI for PRs targeting the 5.0 branch #365

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
manovotn merged 2 commits into from
Jun 30, 2026
Merged

Trigger CI for PRs targeting the 5.0 branch #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a8becf
Trigger CI for PRs targeting the 5.0 branch
manovotn Jun 30, 2026
6381966
Replace hand-written JPA test mocks with Mockito
manovotn Jun 30, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Weld Testing CI

on:
pull_request:
branches: [ master ]
branches: [ 5.0 ]

jobs:
build-weld-junit:
Expand Down
332 changes: 3 additions & 329 deletions junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;

import java.util.List;
import java.util.Map;
import java.util.function.Function;

import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.persistence.Cache;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityTransaction;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.PersistenceUnitUtil;
import jakarta.persistence.Query;
import jakarta.persistence.StoredProcedureQuery;
import jakarta.persistence.SynchronizationType;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import jakarta.persistence.metamodel.Metamodel;

import org.jboss.weld.junit4.WeldInitiator;
import org.junit.Rule;
Expand All @@ -51,7 +35,6 @@
*
* @author Martin Kouba
*/
@SuppressWarnings("rawtypes")
public class InjectResourcesTest {

@Rule
Expand Down Expand Up @@ -87,320 +70,11 @@ public void testJpaInjection() {
// Mock objects

static Function<InjectionPoint, Object> getPCFactory() {
return ip -> new EntityManager() {

@Override
public <T> T unwrap(Class<T> cls) {
return null;
}

@Override
public void setProperty(String propertyName, Object value) {
}

@Override
public void setFlushMode(FlushModeType flushMode) {
}

@Override
public void remove(Object entity) {
}

@Override
public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
}

@Override
public void refresh(Object entity, LockModeType lockMode) {
}

@Override
public void refresh(Object entity, Map<String, Object> properties) {
}

@Override
public void refresh(Object entity) {
}

@Override
public void persist(Object entity) {
}

@Override
public <T> T merge(T entity) {
return null;
}

@Override
public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
}

@Override
public void lock(Object entity, LockModeType lockMode) {
}

@Override
public void joinTransaction() {
}

@Override
public boolean isOpen() {
return false;
}

@Override
public boolean isJoinedToTransaction() {
return false;
}

@Override
public EntityTransaction getTransaction() {
return null;
}

@Override
public <T> T getReference(Class<T> entityClass, Object primaryKey) {
return null;
}

@Override
public Map<String, Object> getProperties() {
return null;
}

@Override
public Metamodel getMetamodel() {
return null;
}

@Override
public LockModeType getLockMode(Object entity) {
return null;
}

@Override
public FlushModeType getFlushMode() {
return null;
}

@Override
public EntityManagerFactory getEntityManagerFactory() {
return null;
}

@Override
public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
return null;
}

@Override
public EntityGraph<?> getEntityGraph(String graphName) {
return null;
}

@Override
public Object getDelegate() {
return null;
}

@Override
public CriteriaBuilder getCriteriaBuilder() {
return null;
}

@Override
public void flush() {
}

@Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
return null;
}

@Override
public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
return null;
}

@Override
public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
return null;
}

@Override
public <T> T find(Class<T> entityClass, Object primaryKey) {
return null;
}

@Override
public void detach(Object entity) {
}

@Override
public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
return null;
}

@Override
public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
return null;
}

@Override
public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
return null;
}

@Override
public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
return null;
}

@Override
public Query createQuery(CriteriaDelete deleteQuery) {
return null;
}

@Override
public Query createQuery(CriteriaUpdate updateQuery) {
return null;
}

@Override
public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
return null;
}

@Override
public Query createQuery(String qlString) {
return null;
}

@Override
public Query createNativeQuery(String sqlString, String resultSetMapping) {
return null;
}

@Override
public Query createNativeQuery(String sqlString, Class resultClass) {
return null;
}

@Override
public Query createNativeQuery(String sqlString) {
return null;
}

@Override
public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
return null;
}

@Override
public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
return null;
}

@Override
public Query createNamedQuery(String name) {
return null;
}

@Override
public EntityGraph<?> createEntityGraph(String graphName) {
return null;
}

@Override
public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
return null;
}

@Override
public boolean contains(Object entity) {
return false;
}

@Override
public void close() {
}

@Override
public void clear() {
}
};
return ip -> mock(EntityManager.class);
}

static Function<InjectionPoint, Object> getPUFactory() {
return ip -> new EntityManagerFactory() {

@Override
public <T> T unwrap(Class<T> cls) {
return null;
}

@Override
public boolean isOpen() {
return false;
}

@Override
public Map<String, Object> getProperties() {
return null;
}

@Override
public PersistenceUnitUtil getPersistenceUnitUtil() {
return null;
}

@Override
public Metamodel getMetamodel() {
return null;
}

@Override
public CriteriaBuilder getCriteriaBuilder() {
return null;
}

@Override
public Cache getCache() {
return null;
}

@Override
public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
return null;
}

@Override
public EntityManager createEntityManager(SynchronizationType synchronizationType) {
return null;
}

@Override
public EntityManager createEntityManager(Map map) {
return null;
}

@Override
public EntityManager createEntityManager() {
return null;
}

@Override
public void close() {
}

@Override
public void addNamedQuery(String name, Query query) {
}

@Override
public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
}
};
return ip -> mock(EntityManagerFactory.class);
}

}
Loading
Loading