Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 82021 invoked from network); 19 Jan 2007 20:06:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jan 2007 20:06:52 -0000 Received: (qmail 31617 invoked by uid 500); 19 Jan 2007 20:06:58 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 31596 invoked by uid 500); 19 Jan 2007 20:06:58 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 31581 invoked by uid 99); 19 Jan 2007 20:06:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 12:06:58 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 12:06:51 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id DEAE71A981A; Fri, 19 Jan 2007 12:05:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497932 - in /maven/continuum/branches/id-refactor/continuum-core/src: main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java Date: Fri, 19 Jan 2007 20:05:46 -0000 To: continuum-commits@maven.apache.org From: rinku@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070119200546.DEAE71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rinku Date: Fri Jan 19 12:05:45 2007 New Revision: 497932 URL: http://svn.apache.org/viewvc?view=rev&rev=497932 Log: o fixes to Build queue. Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java?view=diff&rev=497932&r1=497931&r2=497932 ============================================================================== --- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java (original) +++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java Fri Jan 19 12:05:45 2007 @@ -75,7 +75,7 @@ { BuildProjectTask task = (BuildProjectTask) it.next(); - Integer key = new Integer( task.getProjectId() ); + Long key = new Long( task.getProjectId() ); List projectTasks = (List) projects.get( key ); Modified: maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java?view=diff&rev=497932&r1=497931&r2=497932 ============================================================================== --- maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java (original) +++ maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java Fri Jan 19 12:05:45 2007 @@ -47,7 +47,7 @@ { Project project = addProject( getStore(), "Build Queue Project 1" ); - int projectId = project.getId(); + long projectId = project.getId(); buildProject( projectId, ContinuumProjectState.TRIGGER_SCHEDULED ); @@ -70,9 +70,9 @@ public void testTheQueueWithMultipleProjects() throws Exception { - int projectId1 = addProject( getStore(), "Build Queue Project 2" ).getId(); + long projectId1 = addProject( getStore(), "Build Queue Project 2" ).getId(); - int projectId2 = addProject( getStore(), "Build Queue Project 3" ).getId(); + long projectId2 = addProject( getStore(), "Build Queue Project 3" ).getId(); buildProject( projectId1, ContinuumProjectState.TRIGGER_SCHEDULED ); @@ -101,7 +101,7 @@ { String name = "Build Queue Project 4"; - int projectId = addProject( getStore(), name ).getId(); + long projectId = addProject( getStore(), name ).getId(); buildProject( projectId, ContinuumProjectState.TRIGGER_FORCED ); @@ -127,13 +127,13 @@ // // ---------------------------------------------------------------------- - private void buildProject( int projectId, int trigger ) + private void buildProject( long projectId, int trigger ) throws Exception { buildQueue.put( new BuildProjectTask( projectId, 0, trigger ) ); } - private void assertNextBuildIs( int expectedProjectId ) + private void assertNextBuildIs( long expectedProjectId ) throws Exception { Task task = buildQueue.take();