[picocontainer-scm] [scm-git][1/2] improved
Paul Hammant <git-yCVjj/[email protected]> Sun, 28 Jul 2013 18:58:06 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--4cb71a9b051a6d05a9c50e7bf8637d5927a763a3 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit 4211c272ad90ed11f49661f70cbb097c8461013a=0AAuthor: Paul Hammant = <[email protected]>=0AAuthorDate: Sun, 28 Jul 2013 17:40:35 -0500=0ACommit: = Paul Hammant <[email protected]>=0ACommitDate: Sun, 28 Jul 2013 17:40:35= -0500=0A=0A improved=0A=0Adiff --git a/web/web-core/src/test/com/picoco= ntainer/web/JavaVersionTestCase.java b/web/web-core/src/test/com/picocontai= ner/web/JavaVersionTestCase.java=0Aindex e84416c..9c6c3ab 100644=0A--- a/we= b/web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java=0A+++ b/= web/web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java=0A@@ -= 2,7 +2,7 @@ package com.picocontainer.web;=0A =0A import org.junit.Test;=0A= =0A-import static org.hamcrest.Matchers.startsWith;=0A+import static org.h= amcrest.Matchers.greaterThanOrEqualTo;=0A import static org.junit.Assert.as= sertThat;=0A =0A public class JavaVersionTestCase {=0A@@ -11,7 +11,7 @@ pub= lic class JavaVersionTestCase {=0A public void javaVersionShouldBeJdkSe= venOrAboveBecauseServletApiVersionRequiresThatDuringCompilation() {=0A =0A = String ver =3D System.getProperty("java.runtime.version");=0A- = assertThat(ver, startsWith("1.7"));=0A+ assertThat(ver, greaterTh= anOrEqualTo("1.7"));=0A =0A }=0A =0A=0A=0A=0A= --4cb71a9b051a6d05a9c50e7bf8637d5927a763a3 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w= 3.org/TR/REC-html40/loose.dtd">=0A<html style=3D"font-size: 12px;">=0A<head= ><meta http-equiv=3D"Content-type" content=3D"text/html; charset=3Dutf-8"><= /head>=0A<body style=3D"font-size: 12px;">=0A<style type=3D"text/css">=0Adt= :after { content: ':' !important; }=0A></style>=0A<dl class=3D"title" style= =3D"font-size: 12px; font-family: Verdana; background-color: #ddd; padding:= 10px;">=0A<dt style=3D"font-size: 12px; float: left; font-weight: bold; mi= n-width: 6em;">Commit</dt>=0A<dd style=3D"font-size: 12px;">4211c272ad90ed1= 1f49661f70cbb097c8461013a</dd>=0A<dt style=3D"font-size: 12px; float: left;= font-weight: bold; min-width: 6em;">Branch</dt>=0A<dd style=3D"font-size: = 12px;">master</dd>=0A<dt style=3D"font-size: 12px; float: left; font-weight= : bold; min-width: 6em;">Author</dt>=0A<dd style=3D"font-size: 12px;">Paul = Hammant <[email protected]></dd>=0A<dt style=3D"font-size: 12px; float= : left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style=3D"font-s= ize: 12px;">Sun, 28 Jul 2013 17:40:35 -0500</dd>=0A<dt style=3D"font-size: = 12px; float: left; font-weight: bold; min-width: 6em;">Message</dt>=0A<dd c= lass=3D"" style=3D"font-size: 12px;">improved</dd>=0A</dl>=0A<h2 id=3D"web/= web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java" style=3D"= font-size: 12px; font-family: Verdana; font-weight: bold; line-height: 25px= ; margin-bottom: 2px; padding-left: 5px; background-color: #bbb;">Changed f= ile web/web-core/src/test/com/picocontainer/web/JavaVersionTestCase.java</h= 2>=0A=0A<table style=3D"font-size: 12px; width: 100%; border-collapse: coll= apse;">=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-= size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','= Courier',monospace; width: 23px; text-align: right; background-color: #ccc;= " align=3D"right" bgcolor=3D"#ccc">2</td>=0A<td class=3D"ln" style=3D"font-= size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','= Courier',monospace; width: 23px; text-align: right; background-color: #ccc;= " align=3D"right" bgcolor=3D"#ccc">2</td>=0A<td style=3D"font-size: 12px; c= olor: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mono= space;">=C2=A0</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class= =3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; b= ackground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">3</td>=0A<td class= =3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; b= ackground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">3</td>=0A<td style= =3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','= Monaco','Courier',monospace;">=C2=A0import=C2=A0org.junit.Test;</td>=0A</tr= >=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: = 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courie= r',monospace; width: 23px; text-align: right; background-color: #ccc;" alig= n=3D"right" bgcolor=3D"#ccc">4</td>=0A<td class=3D"ln" style=3D"font-size: = 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courie= r',monospace; width: 23px; text-align: right; background-color: #ccc;" alig= n=3D"right" bgcolor=3D"#ccc">4</td>=0A<td style=3D"font-size: 12px; color: = #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;= ">=C2=A0</td>=0A</tr>=0A<tr class=3D"r" style=3D"font-size: 12px; backgroun= d-color: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12= px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier'= ,monospace; width: 23px; text-align: right; background-color: #ccc;" align= =3D"right" bgcolor=3D"#ccc">5</td>=0A<td class=3D"ln" style=3D"font-size: 1= 2px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier= ',monospace; width: 23px; text-align: right; background-color: #ccc;" align= =3D"right" bgcolor=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #0= 00; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">= =C2=A0import=C2=A0static=C2=A0org.hamcrest.Matchers.<span class=3D"rr" styl= e=3D"font-size: 12px; background-color: #faa;">startsWith</span>;</td>=0A</= tr>=0A<tr class=3D"a" style=3D"font-size: 12px; background-color: #dfd;" bg= color=3D"#dfd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; f= ont-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width:= 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor= =3D"#ccc"></td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; f= ont-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width:= 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor= =3D"#ccc">5</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: = 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0import=C2= =A0static=C2=A0org.hamcrest.Matchers.<span class=3D"aa" style=3D"font-size:= 12px; background-color: #afa;">greaterThanOrEqualTo</span>;</td>=0A</tr>= =0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 1= 2px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier= ',monospace; width: 23px; text-align: right; background-color: #ccc;" align= =3D"right" bgcolor=3D"#ccc">6</td>=0A<td class=3D"ln" style=3D"font-size: 1= 2px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier= ',monospace; width: 23px; text-align: right; background-color: #ccc;" align= =3D"right" bgcolor=3D"#ccc">6</td>=0A<td style=3D"font-size: 12px; color: #= 000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;"= >=C2=A0import=C2=A0static=C2=A0org.junit.Assert.assertThat;</td>=0A</tr>=0A= <tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px= ; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m= onospace; width: 23px; text-align: right; background-color: #ccc;" align=3D= "right" bgcolor=3D"#ccc">7</td>=0A<td class=3D"ln" style=3D"font-size: 12px= ; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m= onospace; width: 23px; text-align: right; background-color: #ccc;" align=3D= "right" bgcolor=3D"#ccc">7</td>=0A<td style=3D"font-size: 12px; color: #000= ; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">= =C2=A0</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" st= yle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono= ','Monaco','Courier',monospace; width: 23px; text-align: right; background-= color: #ccc;" align=3D"right" bgcolor=3D"#ccc">8</td>=0A<td class=3D"ln" st= yle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono= ','Monaco','Courier',monospace; width: 23px; text-align: right; background-= color: #ccc;" align=3D"right" bgcolor=3D"#ccc">8</td>=0A<td style=3D"font-s= ize: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','C= ourier',monospace;">=C2=A0public=C2=A0class=C2=A0JavaVersionTestCase=C2=A0{= </td>=0A</tr>=0A<tr class=3D"sep" style=3D"font-size: 12px;"><td class=3D"s= ep" colspan=3D"3" title=3D"Unchanged content skipped between diff. blocks" = style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mo= no','Monaco','Courier',monospace; text-align: center; border-top-width: 1px= ; border-top-color: Gray; border-top-style: solid; border-bottom-width: 1px= ; border-bottom-color: Gray; border-bottom-style: solid;" align=3D"center">= =E2=80=A6</td></tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" st= yle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono= ','Monaco','Courier',monospace; width: 23px; text-align: right; background-= color: #ccc;" align=3D"right" bgcolor=3D"#ccc">11</td>=0A<td class=3D"ln" s= tyle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mon= o','Monaco','Courier',monospace; width: 23px; text-align: right; background= -color: #ccc;" align=3D"right" bgcolor=3D"#ccc">11</td>=0A<td style=3D"font= -size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco',= 'Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0public=C2=A0void=C2=A0j= avaVersionShouldBeJdkSevenOrAboveBecauseServletApiVersionRequiresThatDuring= Compilation()=C2=A0{</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td c= lass=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream = Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: righ= t; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">12</td>=0A<td = class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream= Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: rig= ht; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">12</td>=0A<td= style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans M= ono','Monaco','Courier',monospace;">=C2=A0</td>=0A</tr>=0A<tr style=3D"font= -size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; fo= nt-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: = 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor= =3D"#ccc">13</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000;= font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; widt= h: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolo= r=3D"#ccc">13</td>=0A<td style=3D"font-size: 12px; color: #000; font-family= : 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0String=C2=A0ver=C2=A0=3D=C2=A0System= .getProperty("java.runtime.version");</td>=0A</tr>=0A<tr class=3D"r" style= =3D"font-size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A<td class= =3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; b= ackground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">14</td>=0A<td clas= s=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ver= a Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; = background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td style= =3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','= Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0assertThat(ver,=C2=A0<span class=3D"rr" style=3D"font-size: 12px; = background-color: #faa;">startsWith</span>("1.7"));</td>=0A</tr>=0A<tr clas= s=3D"a" style=3D"font-size: 12px; background-color: #dfd;" bgcolor=3D"#dfd"= >=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'B= itstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-al= ign: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>= =0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi= tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali= gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">14</td= >=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0assertThat(ver,=C2=A0<span class=3D"aa" style=3D"fo= nt-size: 12px; background-color: #afa;">greaterThanOrEqualTo</span>("1.7"))= ;</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style= =3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','= Monaco','Courier',monospace; width: 23px; text-align: right; background-col= or: #ccc;" align=3D"right" bgcolor=3D"#ccc">15</td>=0A<td class=3D"ln" styl= e=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono',= 'Monaco','Courier',monospace; width: 23px; text-align: right; background-co= lor: #ccc;" align=3D"right" bgcolor=3D"#ccc">15</td>=0A<td style=3D"font-si= ze: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Co= urier',monospace;">=C2=A0</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A= <td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitst= ream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align:= right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">16</td>= =0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi= tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali= gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">16</td= >=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}<= /td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"= font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mona= co','Courier',monospace; width: 23px; text-align: right; background-color: = #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td class=3D"ln" style=3D= "font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mon= aco','Courier',monospace; width: 23px; text-align: right; background-color:= #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td style=3D"font-size: = 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courie= r',monospace;">=C2=A0</td>=0A</tr>=0A</table>=0A<br style=3D"font-size: 12p= x;"><br style=3D"font-size: 12px;">=0A</body>=0A</html>=0A= --4cb71a9b051a6d05a9c50e7bf8637d5927a763a3--