Skip to content

Create More Faces CheckPoint Tests #31234

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.

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

Open
wants to merge 2 commits into
base: integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions dev/io.openliberty.checkpoint_fat_faces/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="fat/src" />
<classpathentry kind="src" path="test-applications/CDIIntegrationTest.war/src" />
<classpathentry kind="src" path="test-applications/CDIManagedProperty.war/src" />
<classpathentry kind="src" path="test-applications/ConvertDateTime.war/src" />
<classpathentry kind="src" path="test-applications/ConverterValidatorBehaviorInjectionTarget.war/src" />
<classpathentry kind="src" path="test-applications/ELImplicitObjectsViaCDI.war/src" />
<classpathentry kind="src" path="test-applications/ELImplicitObjectsViaCDI.war/src" />
<classpathentry kind="src" path="test-applications/ELImplicitObjectsViaCDIErrorApp.war/src" />
<classpathentry kind="src" path="test-applications/UIRepeatConditionCheck.war/src" />
<classpathentry kind="src" path="test-applications/PostRenderViewEvent.war/src" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
<classpathentry kind="con" path="aQute.bnd.classpath.container" />
<classpathentry kind="output" path="bin" />
</classpath>
34 changes: 34 additions & 0 deletions dev/io.openliberty.checkpoint_fat_faces/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>io.openliberty.checkpoint_fat_faces</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
<filteredResources>
<filter>
<id>1744220855508</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary?

<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Ant properties
#Automatically generated by the ant prepare.settings.files task
eclipse.preferences.version=1
encoding/<project>=UTF-8

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.staticondemandthreshold=99
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/** */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=false
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=true
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=true
sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
69 changes: 69 additions & 0 deletions dev/io.openliberty.checkpoint_fat_faces/bnd.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#*******************************************************************************
# Copyright (c) 2025 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#*******************************************************************************
-include= ~../cnf/resources/bnd/bundle.props
bVersion=1.0

src: \
fat/src,\
test-applications/CDIIntegrationTest.war/src, \
test-applications/CDIManagedProperty.war/src, \
test-applications/ConvertDateTime.war/src, \
test-applications/ConverterValidatorBehaviorInjectionTarget.war/src, \
test-applications/ELImplicitObjectsViaCDI.war/src, \
test-applications/ELImplicitObjectsViaCDI.war/src, \
test-applications/ELImplicitObjectsViaCDIErrorApp.war/src, \
test-applications/UIRepeatConditionCheck.war/src, \
test-applications/PostRenderViewEvent.war/src

fat.project: true

tested.features: \
beanvalidation-2.0,\
beanvalidation-3.0,\
cdi-2.0,\
cdi-3.0,\
cdi-4.0,\
cdi-4.1,\
checkpoint,\
expressionlanguage-4.0,\
expressionlanguage-5.0,\
expressionlanguage-6.0,\
faces-3.0,\
faces-4.0,\
faces-4.1,\
jsf-2.3,\
pages-3.0,\
pages-3.1,\
servlet-4.0,\
servlet-5.0,\
servlet-6.0,\
servlet-6.1,\
validation-3.1


-buildpath: \
com.ibm.websphere.javaee.annotation.1.2;version=latest,\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clean up this formatting in the bnd?

com.ibm.ws.org.apache.httpcomponents;version=latest, \
net.sourceforge.htmlunit:htmlunit;version=2.44.0,\
net.sourceforge.htmlunit:webdriver;version=2.6,\
net.sourceforge.htmlunit:neko-htmlunit;strategy=exact;version=2.44.0,\
org.seleniumhq.webdriver:webdriver-common;version=0.9.7376,\
org.brotli:dec;version=0.1.2,\
net.sourceforge.htmlunit:htmlunit-cssparser;version=1.6.0,\
xml-apis:xml-apis;version=1.4.01,\
com.ibm.websphere.appserver.thirdparty.jsf-2.3;version=latest, \
com.ibm.ws.org.apache.myfaces.2.3;version=latest, \
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
com.ibm.websphere.javaee.jsf.2.3;version=latest,\
com.ibm.websphere.javaee.servlet.4.0;version=latest,\
com.ibm.websphere.javaee.el.3.0;version=latest,\
io.openliberty.org.apache.commons.logging;version=latest,\
io.openliberty.org.apache.commons.codec;version=latest,\
io.openliberty.org.apache.xercesImpl;version=latest
41 changes: 41 additions & 0 deletions dev/io.openliberty.checkpoint_fat_faces/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*******************************************************************************
* Copyright (c) 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/

dependencies {
requiredLibs 'net.sourceforge.htmlunit:htmlunit-cssparser:1.6.0',
'net.sourceforge.htmlunit:htmlunit:2.44.0',
'net.sourceforge.htmlunit:htmlunit-core-js:2.44.0',
'net.sourceforge.htmlunit:neko-htmlunit:2.44.0',
'net.sourceforge.htmlunit:webdriver:2.6',
'org.seleniumhq.webdriver:webdriver-common:0.9.7376',
'org.brotli:dec:0.1.2',
'org.apache.commons:commons-lang3:3.8',
project(':com.ibm.ws.org.apache.commons.io'),
project(':io.openliberty.org.apache.commons.codec'),
'org.apache.httpcomponents:httpmime:4.5.3',
project(':com.ibm.ws.org.apache.httpcomponents'),
'org.eclipse.jetty:jetty-io:9.2.15.v20160210',
'org.eclipse.jetty:jetty-websocket:8.2.0.v20160908',
'org.eclipse.jetty.websocket:websocket-client:9.2.15.v20160210',
'org.eclipse.jetty.websocket:websocket-api:9.2.15.v20160210',
'org.eclipse.jetty.websocket:websocket-common:9.2.15.v20160210',
'org.eclipse.jetty:jetty-websocket:8.2.0.v20160908',
'org.eclipse.jetty:jetty-util:9.2.15.v20160210',
'org.eclipse.jetty:jetty-http:9.4.9.v20180320',
'org.eclipse.birt.runtime:org.w3c.css.sac:1.3.1.v200903091627',
project(':io.openliberty.org.apache.commons.codec'),
project(':io.openliberty.org.apache.commons.logging'),
'org.apache.commons:commons-text:1.9',
project(':io.openliberty.org.apache.xercesImpl'),
'xalan:xalan:2.7.2',
'xml-apis:xml-apis:1.4.01'
}

addRequiredLibraries.dependsOn addJakartaTransformer
6 changes: 6 additions & 0 deletions dev/io.openliberty.checkpoint_fat_faces/cognitiveMetadata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
# YML metadata file made use of by the Cognitive Ecosystem.
# Reference Cognitive Metadata is available at: https://github.com/OpenLiberty/open-liberty/tree/integration/dev/build.example_fat/cognitiveMetadata.yml
# description: Uncomment this field and add a description to give some notes about this bucket.
# triageNotes: Uncomment this field if there are some short notes you would like Pipeline Monitors to see when triaging this bucket.
functionalArea: InstantOn
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*******************************************************************************
* Copyright (c) 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package io.openliberty.checkpoint.fat;

import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;

import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;

import com.ibm.ws.fat.util.FatLogHandler;

import componenttest.custom.junit.runner.FATRunner;

import componenttest.custom.junit.runner.AlwaysPassesTest;
import componenttest.topology.impl.LibertyServer;

import componenttest.rules.repeater.EmptyAction;
import componenttest.rules.repeater.FeatureReplacementAction;
import componenttest.rules.repeater.RepeatTests;

@RunWith(Suite.class)
@SuiteClasses({
AlwaysPassesTest.class,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need the AlwaysPassesTest?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this bucket doesn't run on a CRIU-capable machine, then the bucket should still pass. We don't want false positives. CRIU is Linux specific.

JSF23CDIGeneralTests.class,
JSF23UIRepeatConditionTests.class
})

public class FATSuite {

@ClassRule
public static RepeatTests repeat;

static {
repeat = RepeatTests.with(new EmptyAction().fullFATOnly())
.andWith(FeatureReplacementAction.EE9_FEATURES().conditionalFullFATOnly(FeatureReplacementAction.GREATER_THAN_OR_EQUAL_JAVA_11))
.andWith(FeatureReplacementAction.EE10_FEATURES().conditionalFullFATOnly(FeatureReplacementAction.GREATER_THAN_OR_EQUAL_JAVA_17))
.andWith(FeatureReplacementAction.EE11_FEATURES());
}

/**
* @see {@link FatLogHandler#generateHelpFile()}
*/
@BeforeClass
public static void generateHelpFile() {
FatLogHandler.generateHelpFile();
}
}
Loading