Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 329979

Summary:

Provide integration test for supplying web.xml in a fragment

Product:

[RT] Gemini.Web

Reporter:

Glyn Normington <glyn.normington>

Component:

unknown

Assignee:

Glyn Normington <glyn.normington>

Status:

CLOSED FIXED

QA Contact:

Severity:

enhancement

Priority:

CC:

milesg78

Version:

1.1.0.RELEASE

Keywords:

helpwanted

Target Milestone:

1.2.0.M02

Hardware:

OS:

Mac OS X - Carbon (unsup.)

Whiteboard:

Attachments:

Description	Flags
Integration test for supplying web.xml in a fragment	none
Integration test for supplying web.xml in a fragment	glyn.normington: iplog+

Description Glyn Normington

2010-11-11 04:56:51 EST

This function was added as a fix to OSGi bug 1617 in the OSGi web container git repo (git@git.springsource.org:osgi-web-container/osgi-web-container.git) under commit 995cabf8b306c2fe977deadfbe37cf4da7fbed58, but no integration test was added.

Recently bug 329566 is being fixed which looks very unlikely to regress this function, but it would be good to include an integration test for future reference since we do not run the OSGi web applications compliance test suite, which belongs to the OSGi Alliance, against Gemini Web.

Flagging this bug as "helpwanted" as it is unlikely to be implemented by the current committers any time soon and it is an easy introduction to integration testing on Gemini Web.

Comment 1 Violeta Georgieva

2010-11-11 05:52:48 EST

(In reply to comment #0)
> Flagging this bug as "helpwanted" as it is unlikely to be implemented by the
> current committers any time soon and it is an easy introduction to integration
> testing on Gemini Web.


Hi Glyn,

I can prepare an integration test if you don't mind?

10x Violeta

Comment 2 Glyn Normington

2010-11-11 09:10:30 EST

That would be great. Thanks!

Comment 3 Violeta Georgieva

2010-11-12 04:16:22 EST

Created attachment 182968 [details]
Integration test for supplying web.xml in a fragment

Hi Glyn,

I'm attaching a patch with an integration test that covers this scenario.
Could you please comment on it?

10x Violeta

Comment 4 Glyn Normington

2010-11-18 04:06:00 EST

Thanks Violeta! Please would you confirm that you wrote 100% of the patch and that you have the right to contribute it to Eclipse.

Comment 5 Glyn Normington

2010-11-18 04:12:05 EST

I couldn't apply the patch. git apply gave the message: 


error: cannot apply binary patch to 'org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar' without full index line
error: org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar: patch does not apply
error: cannot apply binary patch to 'org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war' without full index line
error: org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war: patch does not apply

It seems the trouble is because new binary archives were added but were not captured by the patch. In fact, the policy in Gemini Web is to build the test archives from source on each build (see the build target build-test-apps).

So please could you rework the patch to include the test archive source code so they will be built automatically. Thanks and apologies for not noticing this earlier.

Comment 6 Violeta Georgieva

2010-11-19 04:07:26 EST

Created attachment 183453 [details]
Integration test for supplying web.xml in a fragment

Hi Glyn,

Here is the reworked patch.
Hope this time everything is OK.

I confirm that I wrote 100% of the patch and that I have the right to contribute it to Eclipse.

Regards
Violeta

Comment 7 Glyn Normington

2010-11-26 08:58:52 EST

Excellent! Thanks. Patch applied, tested, committed, and pushed.