← Back to branch summary

~ubuntu-branches/ubuntu/natty/cobertura/natty

« back to all changes in this revision

Viewing changes to test/net/sourceforge/cobertura/merge/MergeTest.java

  • Committer: Bazaar Package Importer
  • Author(s): Miguel Landaeta
  • Date: 2010-05-11 19:21:46 UTC
  • mfrom: (0.1.4 sid) (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100511192146-j742v5jsl89ztndu
Tags: 1.9.4.1+dfsg-2
http://bugs.debian.org/580842
* Now Build-Depends on libservlet2.5-java and add a missing Depends
  on the same package. (Closes: #580842). 
* Simplify list of JRE dependences for cobertura and drop JRE dependences for
  libcobertura-java as Java libraries are no longer required to depend on a
  JVM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/net/sourceforge/cobertura/merge/MergeTest.java
56
56
                redProject.addClassData( sixthClass);
57
57
                redProject.addClassData( seventhClass);
58
58
                
 
59
                //merge with null - should not change the greenProject
 
60
                greenProject.merge(null);
 
61
                
59
62
                greenProject.merge( redProject);
60
63
                
61
64
                Iterator subpackages = greenProject.getSubPackages( "").iterator();
177
180
 
178
181
        public void testMergeSimillarLineNumbers() {
179
182
                firstClass.addLine( 2, "helloWorld","()V");
180
 
                firstClass.touch(2);
181
 
                firstClass.touch(2);
 
183
                firstClass.touch(2,1);
 
184
                firstClass.touch(2,1);
182
185
                firstClass.addLine( 3, "helloWorld","()V");
183
186
                greenProject.addClassData( firstClass);
184
187
                
185
188
                firstClassB.addLine( 2, "helloWorld","()V");
186
 
                firstClassB.touch(2);
187
 
                firstClassB.touch(2);
188
 
                firstClassB.touch(2);
 
189
                firstClassB.touch(2,1);
 
190
                firstClassB.touch(2,1);
 
191
                firstClassB.touch(2,1);
189
192
                firstClassB.addLine( 3, "helloWorld","()V");
190
 
                firstClassB.touch(3);
 
193
                firstClassB.touch(3,1);
191
194
                firstClassB.addLine( 7, "helloWorld","()V");
192
195
                redProject.addClassData( firstClassB);
193
196