Return-Path: X-Original-To: apmail-onami-commits-archive@minotaur.apache.org Delivered-To: apmail-onami-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 32D12E0BC for ; Sun, 9 Dec 2012 10:35:38 +0000 (UTC) Received: (qmail 55995 invoked by uid 500); 9 Dec 2012 10:35:38 -0000 Delivered-To: apmail-onami-commits-archive@onami.apache.org Received: (qmail 55958 invoked by uid 500); 9 Dec 2012 10:35:38 -0000 Mailing-List: contact commits-help@onami.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@onami.incubator.apache.org Delivered-To: mailing list commits@onami.incubator.apache.org Received: (qmail 55950 invoked by uid 99); 9 Dec 2012 10:35:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 10:35:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 10:35:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CF5712388B43; Sun, 9 Dec 2012 10:35:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418889 [3/7] - in /incubator/onami/site/test: ./ cobertura/ Date: Sun, 09 Dec 2012 10:35:08 -0000 To: commits@onami.incubator.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121209103514.CF5712388B43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.annotation.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.annotation.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.annotation.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.annotation.html Sun Dec 9 10:34:58 2012 @@ -48,6 +48,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.handler.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.handler.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.handler.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.handler.html Sun Dec 9 10:34:58 2012 @@ -47,6 +47,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.html Sun Dec 9 10:34:58 2012 @@ -50,6 +50,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.framework.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.framework.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.framework.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.framework.html Sun Dec 9 10:34:58 2012 @@ -40,6 +40,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.guice.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.guice.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.guice.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.guice.html Sun Dec 9 10:34:58 2012 @@ -40,6 +40,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.mock.html Sun Dec 9 10:34:58 2012 @@ -39,6 +39,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.reflection.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.reflection.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.reflection.html (original) +++ incubator/onami/site/test/cobertura/frame-summary-org.apache.onami.test.reflection.html Sun Dec 9 10:34:58 2012 @@ -47,6 +47,6 @@ var classTable = new SortableTable(docum ["String", "Percentage", "Percentage", "FormattedNumber"]); classTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/frame-summary.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/frame-summary.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/frame-summary.html (original) +++ incubator/onami/site/test/cobertura/frame-summary.html Sun Dec 9 10:34:58 2012 @@ -31,6 +31,6 @@ var packageTable = new SortableTable(doc ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); - + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/org.apache.onami.test.GuiceMockModule.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/org.apache.onami.test.GuiceMockModule.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/org.apache.onami.test.GuiceMockModule.html (original) +++ incubator/onami/site/test/cobertura/org.apache.onami.test.GuiceMockModule.html Sun Dec 9 10:34:58 2012 @@ -143,7 +143,7 @@

- 64 1

     final static private Logger logger = Logger.getLogger( GuiceMockModule.class.getName() );

+ 64 2

     final static private Logger logger = Logger.getLogger( GuiceMockModule.class.getName() );

66 @@ -164,9 +164,9 @@

     public GuiceMockModule( final Map<Field, Object> mockedFields )

- 75 7

- 76 7

         this.mockedFields = mockedFields;

- 77 7

+ 75 14

+ 76 14

         this.mockedFields = mockedFields;

+ 77 14

79 @@ -177,69 +177,69 @@

     protected void configure()

- 83 7

         final Multimap<Type, Field> fieldsByType = HashMultimap.create();

+ 83 14

         final Multimap<Type, Field> fieldsByType = HashMultimap.create();

- 85 7

         for ( final Entry<Field, Object> entry : this.mockedFields.entrySet() )

+ 85 14

         for ( final Entry<Field, Object> entry : this.mockedFields.entrySet() )

- 87 11

             fieldsByType.put( entry.getKey().getGenericType(), entry.getKey() );

+ 87 22

             fieldsByType.put( entry.getKey().getGenericType(), entry.getKey() );

- 90 7

         for ( final Type type : fieldsByType.keySet() )

+ 90 14

         for ( final Type type : fieldsByType.keySet() )

- 92 9

             final Collection<Field> fields = fieldsByType.get( type );

+ 92 18

             final Collection<Field> fields = fieldsByType.get( type );

- 94 9

             boolean isTypeConflicts = false;

- 95 9

             if ( fields.size() != 1 )

+ 94 18

             boolean isTypeConflicts = false;

+ 95 18

             if ( fields.size() != 1 )

- 97 1

                 isTypeConflicts = checkTypeConflict( fields );

+ 97 2

                 isTypeConflicts = checkTypeConflict( fields );

- 100 9

             checkState( !isTypeConflicts, "   Found multiple annotation @%s for type: %s; binding skipped!.",

+ 100 18

             checkState( !isTypeConflicts, "   Found multiple annotation @%s for type: %s; binding skipped!.",

101

                         Mock.class.getSimpleName(), type );

- 102 9

             for ( final Field field : fields )

+ 102 18

             for ( final Field field : fields )

103

- 104 11

                 final TypeLiteral literal = TypeLiteral.get( type );

- 105 11

                 final Mock annoBy = field.getAnnotation( Mock.class );

- 106 11

                 final Object mock = this.mockedFields.get( field );

- 107 11

                 if ( annoBy.annotatedWith() != Mock.NoAnnotation.class )

+ 104 22

                 final TypeLiteral literal = TypeLiteral.get( type );

+ 105 22

                 final Mock annoBy = field.getAnnotation( Mock.class );

+ 106 22

                 final Object mock = this.mockedFields.get( field );

+ 107 22

                 if ( annoBy.annotatedWith() != Mock.NoAnnotation.class )

108

- 109 1

                     bind( literal ).annotatedWith( annoBy.annotatedWith() ).toInstance( mock );

+ 109 2

                     bind( literal ).annotatedWith( annoBy.annotatedWith() ).toInstance( mock );

110

- 111 10

                 else if ( !"".equals( annoBy.namedWith() ) )

+ 111 20

                 else if ( !"".equals( annoBy.namedWith() ) )

112

- 113 1

                     bind( literal ).annotatedWith( Names.named( annoBy.namedWith() ) ).toInstance( mock );

+ 113 2

                     bind( literal ).annotatedWith( Names.named( annoBy.namedWith() ) ).toInstance( mock );

114

115

                 else

116

- 117 9

                     bind( literal ).toInstance( mock );

+ 117 18

                     bind( literal ).toInstance( mock );

118

- 119 11

                 if ( logger.isLoggable( Level.FINER ) )

+ 119 22

                 if ( logger.isLoggable( Level.FINER ) )

120

- 121 6

                     logger.finer( "    Created binding for: " + type + " " + annoBy );

+ 121 12

                     logger.finer( "    Created binding for: " + type + " " + annoBy );

122

- 123 11

- 124 9

- 125 7

+ 123 22

+ 124 18

+ 125 14

126

127 @@ -254,24 +254,24 @@

     private boolean checkTypeConflict( Collection<Field> fields )

132

- 133 1

         final List<Class<?>> listAnnotatedType = new ArrayList<Class<?>>();

- 134 1

         final List<String> listNamedType = new ArrayList<String>();

- 135 1

         int numOfSimpleType = 0;

+ 133 2

         final List<Class<?>> listAnnotatedType = new ArrayList<Class<?>>();

+ 134 2

         final List<String> listNamedType = new ArrayList<String>();

+ 135 2

         int numOfSimpleType = 0;

136

- 137 1

         for ( Field field : fields )

+ 137 2

         for ( Field field : fields )

138

- 139 3

             final Mock annoBy = field.getAnnotation( Mock.class );

+ 139 6

             final Mock annoBy = field.getAnnotation( Mock.class );

140

- 141 3

             if ( annoBy.annotatedWith() == Mock.NoAnnotation.class && "".equals( annoBy.namedWith() ) )

+ 141 6

             if ( annoBy.annotatedWith() == Mock.NoAnnotation.class && "".equals( annoBy.namedWith() ) )

142

- 143 1

                 numOfSimpleType++;

+ 143 2

                 numOfSimpleType++;

144

- 145 3

             if ( numOfSimpleType > 1 )

+ 145 6

             if ( numOfSimpleType > 1 )

146

147 0

                 logger.finer( "Found multiple simple type" );

@@ -280,13 +280,13 @@

150

- 151 3

             if ( annoBy.annotatedWith() != Mock.NoAnnotation.class )

+ 151 6

             if ( annoBy.annotatedWith() != Mock.NoAnnotation.class )

152

- 153 1

                 if ( !listAnnotatedType.contains( annoBy.annotatedWith() ) )

+ 153 2

                 if ( !listAnnotatedType.contains( annoBy.annotatedWith() ) )

154

- 155 1

                     listAnnotatedType.add( annoBy.annotatedWith() );

+ 155 2

                     listAnnotatedType.add( annoBy.annotatedWith() );

156

157 @@ -303,13 +303,13 @@

164

- 165 3

             if ( !"".equals( annoBy.namedWith() ) )

+ 165 6

             if ( !"".equals( annoBy.namedWith() ) )

166

- 167 1

                 if ( !listNamedType.contains( annoBy.namedWith() ) )

+ 167 2

                 if ( !listNamedType.contains( annoBy.namedWith() ) )

168

- 169 1

                     listNamedType.add( annoBy.namedWith() );

+ 169 2

                     listNamedType.add( annoBy.namedWith() );

170

171 @@ -324,8 +324,8 @@

177

- 178 3

- 179 1

         return false;

+ 178 6

+ 179 2

         return false;

180

181 @@ -334,6 +334,6 @@

- + \ No newline at end of file Modified: incubator/onami/site/test/cobertura/org.apache.onami.test.MockEngineFactory.html URL: http://svn.apache.org/viewvc/incubator/onami/site/test/cobertura/org.apache.onami.test.MockEngineFactory.html?rev=1418889&r1=1418888&r2=1418889&view=diff ============================================================================== --- incubator/onami/site/test/cobertura/org.apache.onami.test.MockEngineFactory.html (original) +++ incubator/onami/site/test/cobertura/org.apache.onami.test.MockEngineFactory.html Sun Dec 9 10:34:58 2012 @@ -107,17 +107,17 @@

     public static MockEngine getMockEngine( MockType type )

- 46 33

         switch ( type )

+ 46 66

         switch ( type )

             case EASY_MOCK:

- 49 30

                 return new EasyMockFramework();

+ 49 60

                 return new EasyMockFramework();

             case MOCKITO:

- 52 3

                 return new MockitoFramework();

+ 52 6

                 return new MockitoFramework();

54 @@ -133,6 +133,6 @@

- + \ No newline at end of file