Commit Graph
355 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 479a8ee97f more test fixes 2012-02-13 13:48:04 -08:00
Kohsuke Kawaguchi b257b6f149 fix NPE 2012-02-13 13:38:18 -08:00
Kohsuke Kawaguchi a71d037b84 Revisited the way Guice creates an injector during unit test
The motivation of this is to enable test code to inject components from Jenkins, which means we need a single Injector that can see all of those, including @TestExtension and regular @Extension. Then I realized that the current implementation is broken, as it creates two independent Injectors. This has other undesirable side effects like @TestExtension components not being able to inject @Extensions, etc.

I briefly experimented with hierarchical Injectors (where we first create Injector that loads @Extension then create another that loads @TestExtension as a child), but this was hard to get right as we have no control over which ExtensionFinder gets instantiated first --- we'd be at the mercy of SezPoz.

So the eventual approach is to allow a single GuiceFinder to recognize multiple annotations. This also works well with our using child injector for installing plugins without restart
2012-02-09 12:18:05 -08:00
Kohsuke Kawaguchi b5973a4a1d Merge branch 'master' of github.com:jenkinsci/jenkins 2012-01-04 12:18:51 -08:00
Albert So 484d952029 [JENKINS-11762] Changes to add a configurable display name to jobs 2012-01-03 15:33:42 -08:00
imod 386618dca4 support new JenkinsPlugin type (jpi) 2012-01-03 11:47:37 -08:00
Kohsuke Kawaguchi 6e02aa9144 doc improvements 2012-01-03 11:45:40 -08:00
kiy0taka 6ffa28d1f7 JUnit4 supports recipes. 2012-01-03 11:41:01 -08:00
Kohsuke Kawaguchi d5710650d7 set the root URL 2011-12-23 19:59:09 -08:00
olivier lamy 39b743d8cb headless true for maven builds in test harness: too much coffee is not good for my heart :-) 2011-11-25 11:26:32 +01:00
Christoph Kutzinski 83822830cf Added (unfortunately yet disfunctional) regression test for JENKINS-11592 2011-11-18 11:02:44 +01:00
Craig P. Motlin 22b13104b3 Remove unnecessary interface modifiers. 2011-11-07 14:52:11 -08:00
Kohsuke Kawaguchi a3489b5bc9 during incremental compilation, the index can get out of sync 2011-11-07 14:00:15 -08:00
Christoph Kutzinski eab5fa8939 don't wake up so often when waiting for Jenkins to finish - it make take away to much time from the threads that are actually doing something 2011-10-30 19:29:33 +01:00
Christoph Kutzinski 4737e0f32c minor 2011-10-30 17:23:04 +01:00
Christoph Kutzinski 0f9e154abb Updated doc 2011-10-30 17:05:07 +01:00
Christoph Kutzinski 8d85066a15 Again javac and jdt doesn't seem to agree whether something is compilable or not 2011-10-30 15:18:28 +01:00
Christoph Kutzinski 58f474dc4d fixed/suppressed some warnings 2011-10-30 14:29:24 +01:00
Christoph Kutzinski 4835e4c37c use assertTrue/False() instead of checking by yourself plus fail() 2011-10-30 14:26:14 +01:00
Christoph Kutzinski 5325a289a4 fixed/suppressed several compiler warnings 2011-10-30 14:14:13 +01:00
Seiji Sogabe b4788e6966 added assertNotContain mehtod. 2011-10-30 21:01:51 +09:00
Kohsuke Kawaguchi d2b16af4e4 Automatically execute the CLI sanity check for plugins 2011-10-28 17:31:46 -07:00
Stephen Connolly bed2a27cf1 Allow pluginManager to be queried by superclasses 2011-10-20 10:27:28 +01:00
Stephen Connolly 1d5cdddf1f Add an annotation to enable skipping Jenkins provisioning for specific tests 2011-10-19 17:01:13 +01:00
Stephen Connolly 8071d0768f Add a fluent interface for specifying a plugin manager 2011-10-19 16:30:24 +01:00
Stephen Connolly c3eb8670b9 sync with HudsonTestCase as JenkinsRule was copied from an earlier version 2011-10-19 16:23:57 +01:00
Stephen Connolly f1d67aa020 Adding a JUnit 4.10+ style rule to replace HudsonTestCase 2011-10-19 16:05:12 +01:00
Kohsuke Kawaguchi 76ada98f34 fixed incorect merge that wiped out the semantics of TestExtension.value() 2011-09-23 21:11:20 -07:00
Kohsuke Kawaguchi e17760256e merged with the latest trunk 2011-09-21 21:41:57 -07:00
Kohsuke Kawaguchi 211231d12b Merged 2dbe144bb7
Conflicts:
	core/src/main/java/hudson/LocalPluginManager.java
2011-08-29 11:52:20 -07:00
Kohsuke Kawaguchi 468987a97f added a hook to specify different PluginManager for testing. 2011-08-29 11:39:57 -07:00
Kohsuke Kawaguchi 9dddea7098 added a recipe to specify a custom plugin manager 2011-08-29 11:36:59 -07:00
Kohsuke Kawaguchi 362362951c Fixed a bug in the test environment setup where the current plugin being tested isn't loaded into Jenkins as a plugin. This also improves the resolution rule so that it doesn't rely on a known set of groupIDs. 2011-08-17 17:01:52 -07:00
Kohsuke Kawaguchi c1920636fe when recording a failure, we record the name of the build step, so for that to work we need TestBuilder to have some valid name. 2011-08-17 17:01:52 -07:00
Kohsuke Kawaguchi 3488cf1e4e regression introduced in 6253fb1b. The first entry, which in most cases is the only entry, gets ignored. 2011-08-17 17:01:52 -07:00
Kohsuke Kawaguchi f6373f7ada Merge branch 'jruby'
Conflicts:
	core/pom.xml
2011-08-08 09:37:32 -07:00
Kohsuke Kawaguchi 578a2f5bf2 [FIXED JENKINS-9363] added API token for REST API. 2011-08-05 18:34:21 -07:00
Jerome Lacoste 386ec0d15e Ensure that the Readers are closed properly 2011-07-23 07:11:06 -07:00
Kohsuke Kawaguchi 51722c3f14 Jenkins! 2011-06-30 08:56:22 -07:00
Kohsuke Kawaguchi 5dddebcf94 Corrected backward incompatible signature changes in 70c1065814. 2011-06-17 22:01:45 -07:00
Kohsuke Kawaguchi e73e870fdc added a switch to verify the presence of the Jelly PI 2011-06-10 08:07:39 -07:00
Nigel Magnay 017e445686 Move hudson.model.Jenkins to be jenkins.model.Jenkins - part III
Fix code that accesses functionality though package protected interfaces;
- access through AbstractCIBase
- make FullDuplexHttpChannel and OverallLoadStatistics public

Test case utility function for adjusting the quiet period variable

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:43 +01:00
Nigel Magnay 5679d019ec Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II
Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:28 +01:00
Nigel Magnay 70c1065814 Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins.
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:00:58 +01:00
Andrew Bayer c0628ee2e5 Removing unneeded imports 2011-05-23 11:20:49 -07:00
Christoph Kutzinski 819c8528de implemented getDescriptor() to - hopefully - fix the AssertionError in the tests 2011-05-22 21:10:37 +02:00
Kohsuke Kawaguchi 5b03fb003c Don't let the debug option in Maven to block Mavens forked from tests 2011-05-11 21:46:49 -07:00
Kohsuke Kawaguchi 7ffa053c0f added a convenience method 2011-04-25 17:22:07 -07:00
Kohsuke Kawaguchi 677ca0fbea Use a bigger buffer as Stapler traces can get pretty large on deeply nested URL 2011-04-21 20:08:59 -07:00
Kohsuke Kawaguchi 3614868694 Merge branch 'oss'
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/model/AutoCompletionCandidates.java
	core/src/main/java/hudson/model/ViewDescriptor.java
	core/src/main/resources/lib/hudson/3rdPartyLicenses.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	core/src/main/resources/lib/hudson/projectViewRow.jelly
	core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
	core/src/main/resources/lib/layout/renderOnDemand.jelly
	core/src/test/java/hudson/FilePathTest.java
	test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
	test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
	ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly
2011-04-21 15:37:31 -07:00