Java library for Bazaar

Merge lp://staging/~adrian-wilkins/bzr-java-lib/small-test-improvments into lp://staging/~verterok/bzr-java-lib/bzr-java-lib

  1. small-test-improvments
  2. Merge into bzr-java-lib
Proposed by Adrian Wilkins
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~adrian-wilkins/bzr-java-lib/small-test-improvments
Merge into: lp://staging/~verterok/bzr-java-lib/bzr-java-lib
Diff against target: 118 lines (+16/-11)
6 files modified
src/test/java/org/vcs/bazaar/client/BazaarClientTest.java (+4/-4)
src/test/java/org/vcs/bazaar/client/commandline/commands/PluginsTest.java (+2/-3)
src/test/java/org/vcs/bazaar/client/commandline/parser/XMLAnnotateParserTest.java (+1/-1)
src/test/java/org/vcs/bazaar/client/utils/BazaarUtilitiesTestWithBranch.java (+1/-1)
src/test/java/org/vcs/bazaar/client/xmlrpc/parser/XMLErrorParserTest.java (+1/-1)
src/test/resources/tests.properties.template (+7/-1)
To merge this branch: bzr merge lp://staging/~adrian-wilkins/bzr-java-lib/small-test-improvments
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Review via email: mp+20022@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Adrian Wilkins (adrian-wilkins) wrote :

A few small improvements to test code and resources.

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/test/java/org/vcs/bazaar/client/BazaarClientTest.java'
2--- src/test/java/org/vcs/bazaar/client/BazaarClientTest.java 2009-12-30 14:23:54 +0000
3+++ src/test/java/org/vcs/bazaar/client/BazaarClientTest.java 2010-02-23 23:50:27 +0000
4@@ -120,7 +120,7 @@
5 while ((line = reader.readLine()) != null) {
6 strBuilder.append(line);
7 }
8- Assert.assertTrue(strBuilder.toString().trim().equals(expectedContent.trim()));
9+ Assert.assertEquals(expectedContent.trim(), strBuilder.toString().trim());
10 }
11
12 @Test public final void testCheckout() throws Exception {
13@@ -608,8 +608,8 @@
14 Map<String, String> result = client.ignored(testEnv.getWorkingTreeLocation());
15 String unixPath = BazaarUtilities.unixFilePath(newFile);
16 Assert.assertNotNull(result.get(unixPath));
17- Assert.assertTrue(result.keySet().size() == 1);
18- Assert.assertTrue(result.get(unixPath).equals(newFile.getName()));
19+ Assert.assertEquals(1, result.keySet().size());
20+ Assert.assertEquals(newFile.getName(), result.get(unixPath));
21
22 // check that ignored also works on large filenames
23 File a_dir = new File(testEnv.getWorkingTreeLocation(), "a_quite_long_named_directory");
24@@ -637,7 +637,7 @@
25 client.ignore(testEnv.getWorkingTreeLocation(), largeRelFile.getPath());
26 result = client.ignored(testEnv.getWorkingTreeLocation());
27 Assert.assertNotNull(result.get(BazaarUtilities.unixFilePath(largeFile)));
28- Assert.assertTrue(result.keySet().size() == 2);
29+ Assert.assertEquals(2, result.keySet().size());
30 Assert.assertEquals(unixRelPath, result.get(BazaarUtilities.unixFilePath(largeFile)));
31
32 }
33
34=== modified file 'src/test/java/org/vcs/bazaar/client/commandline/commands/PluginsTest.java'
35--- src/test/java/org/vcs/bazaar/client/commandline/commands/PluginsTest.java 2009-11-18 08:48:43 +0000
36+++ src/test/java/org/vcs/bazaar/client/commandline/commands/PluginsTest.java 2010-02-23 23:50:27 +0000
37@@ -34,7 +34,7 @@
38 try {
39 cmd.execute(new ShellCommandRunner(true));
40 } catch(CommandLineException e) {
41- Assert.assertTrue(e.getCommand().equals("xmlplugins"));
42+ Assert.assertEquals("xmlplugins", e.getCommand());
43 } finally {
44 prefs.set(BazaarPreference.BZR_PLUGIN_PATH, old);
45 }
46@@ -48,11 +48,10 @@
47 Assert.assertTrue(cmd.getStandardOutput().contains("xmloutput"));
48 for (IPlugin plugin : plugins) {
49 if(plugin.getName().equals("xmloutput")){
50- Assert.assertTrue(true);
51 return;
52 }
53 }
54- Assert.assertTrue(false);
55+ Assert.fail("xmloutput plugin not found");
56 }
57
58 }
59
60=== modified file 'src/test/java/org/vcs/bazaar/client/commandline/parser/XMLAnnotateParserTest.java'
61--- src/test/java/org/vcs/bazaar/client/commandline/parser/XMLAnnotateParserTest.java 2008-10-22 07:05:29 +0000
62+++ src/test/java/org/vcs/bazaar/client/commandline/parser/XMLAnnotateParserTest.java 2010-02-23 23:50:27 +0000
63@@ -20,6 +20,6 @@
64 @Test public void testSimpleAnnotation() throws BazaarClientException, IOException {
65 IBazaarAnnotation ann = CommandLineAnnotation.getAnnotationFromXml(getContentsFrom(annotationFile));
66 Assert.assertNotNull(ann);
67- Assert.assertTrue(ann.getNumberOfLines() == 46);
68+ Assert.assertEquals(46, ann.getNumberOfLines());
69 }
70 }
71
72=== modified file 'src/test/java/org/vcs/bazaar/client/utils/BazaarUtilitiesTestWithBranch.java'
73--- src/test/java/org/vcs/bazaar/client/utils/BazaarUtilitiesTestWithBranch.java 2009-11-18 08:48:43 +0000
74+++ src/test/java/org/vcs/bazaar/client/utils/BazaarUtilitiesTestWithBranch.java 2010-02-23 23:50:27 +0000
75@@ -33,7 +33,7 @@
76
77 File newDir = new File(testEnv.getWorkingTreeLocation(), "new_Dir");
78 newDir.mkdirs();
79- Assert.assertTrue(BazaarUtilities.getRootBranch(newDir).equals(testEnv.getWorkingTreeLocation()));
80+ Assert.assertEquals(testEnv.getWorkingTreeLocation(), BazaarUtilities.getRootBranch(newDir));
81 }
82
83 }
84
85=== modified file 'src/test/java/org/vcs/bazaar/client/xmlrpc/parser/XMLErrorParserTest.java'
86--- src/test/java/org/vcs/bazaar/client/xmlrpc/parser/XMLErrorParserTest.java 2009-11-18 08:48:43 +0000
87+++ src/test/java/org/vcs/bazaar/client/xmlrpc/parser/XMLErrorParserTest.java 2010-02-23 23:50:27 +0000
88@@ -26,7 +26,7 @@
89 Assert.assertNotNull(error.getMessage());
90 Assert.assertNotNull(error.getType());
91 Assert.assertFalse("dict is empty", error.getDict().isEmpty());
92- Assert.assertTrue("dict conatins more than 2 key:value pairs", error.getDict().size() == 2);
93+ Assert.assertEquals("dict does not contain 2 key:value pairs", 2, error.getDict().size());
94 Assert.assertFalse("message is empty", error.getMessage().trim().equals(""));
95 Assert.assertFalse("type is empty", error.getType().trim().equals(""));
96 }
97
98=== modified file 'src/test/resources/tests.properties.template'
99--- src/test/resources/tests.properties.template 2008-10-22 07:05:29 +0000
100+++ src/test/resources/tests.properties.template 2010-02-23 23:50:27 +0000
101@@ -1,9 +1,15 @@
102 # Tests properties
103 bzr.test.reports=./tests-reports
104 bzr.test.rootDir=./tests
105-bzr.test.clientType=
106
107 # Environment dependant properties
108 bzr.user.name=<username>
109 bzr.user.mail=user@mail.net
110 bzr.executable=<path to bzr executable>
111+
112+# Set to CommandLine or XmlRpcClient - defaults to best available
113+bzr.clientType=
114+
115+# Best to set this to a folder that just contains an appropriate checkout of xmloutput
116+# and optionally, bzr-search or any other plugins you are testing with
117+bzr.pluginPath=
118\ No newline at end of file

Subscribers

People subscribed via source and target branches