Skip to content

Commit

Permalink
Merge pull request #1008 from alwin-joseph/ejb32-ejblitejsf-part2
Browse files Browse the repository at this point in the history
Address ejblitejsf test failures in ejb32 - part2
  • Loading branch information
gurunrao committed May 18, 2022
2 parents 46bdff3 + 61e4295 commit b1bbd0e
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 0 deletions.
5 changes: 5 additions & 0 deletions install/jakartaee/other/vehicle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ com/sun/ts/tests/ejb32/lite/timer/interceptor/business/singleton/Client.java = e
com/sun/ts/tests/ejb32/lite/timer/interceptor/business/singleton/JsfClient.java = ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/interceptor/business/stateless/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp ejbembed
com/sun/ts/tests/ejb32/lite/timer/interceptor/business/stateless/JsfClient.java = ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/auto/attr/stateless/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp ejbembed
com/sun/ts/tests/ejb32/lite/timer/schedule/auto/attr/stateless/JsfClient.java = ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/auto/attr/singleton/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp ejbembed
com/sun/ts/tests/ejb32/lite/timer/schedule/auto/attr/singleton/JsfClient.java = ejblitejsf

com/sun/ts/tests/ejb32/lite/timer/schedule/descriptor/stateless/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp ejbembed
com/sun/ts/tests/ejb32/lite/timer/schedule/descriptor/stateless/JsfClient.java = ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java = ejbliteservlet ejbliteservlet2 ejblitejsp ejbembed
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/*
* Copyright (c) 2022 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
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package com.sun.ts.tests.ejb32.lite.timer.schedule.auto.attr.singleton;

import com.sun.ts.tests.ejb30.timer.common.JsfClientBase;

@jakarta.inject.Named("client")
@jakarta.enterprise.context.RequestScoped
public class JsfClient extends JsfClientBase {

// some timeout records are recorded before starting the test (e.g,
// postConstruct test) So override setup method not to remove status.
@Override
protected boolean needToRemoveStatusAndRecords() {
return false;
}

/*
* @testName: postConstruct
*
* @test_Strategy: check the number of auto timers inside bean's
* post-construct method. All auto timers should have been created when
* post-construct method is invoked.
*/
public void postConstruct() {
passIfTimeout("postConstruct");
}

/*
* @testName: autoTimerInSuperClassNoParam
*
* @test_Strategy: an auto-timer is declared in bean superclass. Its time- out
* method takes no Timer param.
*/

/*
* @testName: autoTimerNonPersistent
*
* @test_Strategy: a non-persistent auto-timer is declared in bean class.
*/

/*
* @testName: autoTimerWithInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class with info attr
*/

/*
* @testName: autoTimerWithoutInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class without info attr
*/

/*
* @testName: autoTimerInSuperClassNoParam
*
* @test_Strategy: an auto-timer is declared in bean superclass. Its time- out
* method takes no Timer param.
*/
public void autoTimerInSuperClassNoParam() {
passIfRecurringTimeout("autoTimerInSuperClassNoParam");
}

/*
* @testName: autoTimerNonPersistent
*
* @test_Strategy: a non-persistent auto-timer is declared in bean class.
*/
public void autoTimerNonPersistent() {
passIfRecurringTimeout("autoTimerNonPersistent");
}

/*
* @testName: autoTimerWithInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class with info attr
*/
public void autoTimerWithInfo() {
passIfRecurringTimeout("autoTimerWithInfo");
}

/*
* @testName: autoTimerWithoutInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class without info attr
*/
public void autoTimerWithoutInfo() {
passIfRecurringTimeout("autoTimerWithoutInfo");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<ts.vehicles name="${app.name}" buildleveloverride="2"
classes="${ejb30.timer.common.classes},
${app.common}/Client.class,
com/sun/ts/tests/ejb30/timer/common/JsfClientBase.class,
${app.common}/ScheduleBeanBase2.class,
${app.common}/ScheduleBeanBase3.class
"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright (c) 2022 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
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package com.sun.ts.tests.ejb32.lite.timer.schedule.auto.attr.stateless;

import com.sun.ts.tests.ejb30.timer.common.JsfClientBase;

@jakarta.inject.Named("client")
@jakarta.enterprise.context.RequestScoped
public class JsfClient extends JsfClientBase {

@Override
protected boolean needToRemoveStatusAndRecords() {
return false;
}

/*
* @testName: autoTimerInSuperClassNoParam
*
* @test_Strategy: an auto-timer is declared in bean superclass. Its time- out
* method takes no Timer param.
*/
public void autoTimerInSuperClassNoParam() {
passIfRecurringTimeout("autoTimerInSuperClassNoParam");
}

/*
* @testName: autoTimerNonPersistent
*
* @test_Strategy: a non-persistent auto-timer is declared in bean class.
*/
public void autoTimerNonPersistent() {
passIfRecurringTimeout("autoTimerNonPersistent");
}

/*
* @testName: autoTimerWithInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class with info attr
*/
public void autoTimerWithInfo() {
passIfRecurringTimeout("autoTimerWithInfo");
}

/*
* @testName: autoTimerWithoutInfo
*
* @test_Strategy: verify the auto timer that was created with @Schedule in
* bean class without info attr
*/
public void autoTimerWithoutInfo() {
passIfRecurringTimeout("autoTimerWithoutInfo");
}
}

0 comments on commit b1bbd0e

Please sign in to comment.