@@ -266,11 +266,11 @@ public void testDiskDef() {
266266 assertEquals (bus , disk .getBusType ());
267267 assertEquals (DiskDef .DeviceType .DISK , disk .getDeviceType ());
268268
269- String xmlDef = disk .toString ();
269+ String resultingXml = disk .toString ();
270270 String expectedXml = "<disk device='disk' type='file'>\n <driver name='qemu' type='" + type .toString () + "' cache='" + cacheMode .toString () + "' />\n " +
271271 "<source file='" + filePath + "'/>\n <target dev='" + diskLabel + "' bus='" + bus .toString () + "'/>\n </disk>\n " ;
272272
273- assertEquals (xmlDef , expectedXml );
273+ assertEquals (expectedXml , resultingXml );
274274 }
275275
276276 @ Test
@@ -288,7 +288,7 @@ public void testDiskDefWithEncryption() {
288288 "<secret type='passphrase' uuid='" + passphraseUuid + "' />\n " +
289289 "</encryption>\n " +
290290 "</disk>\n " ;
291- assertEquals (disk .toString (), expectedXML );
291+ assertEquals (expectedXML , disk .toString ());
292292 }
293293
294294 @ Test
@@ -398,7 +398,7 @@ public void testDiskDefWithBurst() {
398398 LibvirtVMDef .setGlobalQemuVersion (2006000L );
399399 LibvirtVMDef .setGlobalLibvirtVersion (9008L );
400400
401- String xmlDef = disk .toString ();
401+ String resultingXml = disk .toString ();
402402 String expectedXml = "<disk device='disk' type='file'>\n <driver name='qemu' type='" + type .toString () + "' cache='none' />\n " +
403403 "<source file='" + filePath + "'/>\n <target dev='" + diskLabel + "' bus='" + bus .toString () + "'/>\n " +
404404 "<iotune>\n <read_bytes_sec>" +bytesReadRate +"</read_bytes_sec>\n <write_bytes_sec>" +bytesWriteRate +"</write_bytes_sec>\n " +
@@ -408,29 +408,29 @@ public void testDiskDefWithBurst() {
408408 "<read_bytes_sec_max_length>" +bytesReadRateMaxLength +"</read_bytes_sec_max_length>\n <write_bytes_sec_max_length>" +bytesWriteRateMaxLength +"</write_bytes_sec_max_length>\n " +
409409 "<read_iops_sec_max_length>" +iopsReadRateMaxLength +"</read_iops_sec_max_length>\n <write_iops_sec_max_length>" +iopsWriteRateMaxLength +"</write_iops_sec_max_length>\n </iotune>\n </disk>\n " ;
410410
411- assertEquals (xmlDef , expectedXml );
411+ assertEquals (expectedXml , resultingXml );
412412 }
413413
414414 @ Test
415415 public void memBalloonDefTestNone () {
416- String expectedXml = "<memballoon model='none'>\n </memballoon>" ;
416+ String expectedXml = "<memballoon model='none' autodeflate='on' >\n </memballoon>" ;
417417 MemBalloonDef memBalloonDef = new MemBalloonDef ();
418418 memBalloonDef .defNoneMemBalloon ();
419419
420- String xmlDef = memBalloonDef .toString ();
420+ String resultingXml = memBalloonDef .toString ();
421421
422- assertEquals (xmlDef , expectedXml );
422+ assertEquals (expectedXml , resultingXml );
423423 }
424424
425425 @ Test
426426 public void memBalloonDefTestVirtio () {
427- String expectedXml = "<memballoon model='virtio'>\n <stats period='60'/>\n </memballoon>" ;
427+ String expectedXml = "<memballoon model='virtio' autodeflate='on' >\n <stats period='60'/>\n </memballoon>" ;
428428 MemBalloonDef memBalloonDef = new MemBalloonDef ();
429429 memBalloonDef .defVirtioMemBalloon ("60" );
430430
431- String xmlDef = memBalloonDef .toString ();
431+ String resultingXml = memBalloonDef .toString ();
432432
433- assertEquals (xmlDef , expectedXml );
433+ assertEquals (expectedXml , resultingXml );
434434 }
435435
436436 @ Test
@@ -465,11 +465,11 @@ public void testRngDef() {
465465 int bytes = 2048 ;
466466
467467 LibvirtVMDef .RngDef def = new LibvirtVMDef .RngDef (path , backendModel , bytes , period );
468- assertEquals (def .getPath (), path );
469- assertEquals (def .getRngBackendModel (), backendModel );
470- assertEquals (def . getRngModel (), LibvirtVMDef .RngDef .RngModel .VIRTIO );
471- assertEquals (def .getRngRateBytes (), bytes );
472- assertEquals (def .getRngRatePeriod (), period );
468+ assertEquals (path , def .getPath ());
469+ assertEquals (backendModel , def .getRngBackendModel ());
470+ assertEquals (LibvirtVMDef .RngDef .RngModel .VIRTIO , def . getRngModel () );
471+ assertEquals (bytes , def .getRngRateBytes ());
472+ assertEquals (period , def .getRngRatePeriod ());
473473 }
474474
475475 @ Test
@@ -493,8 +493,8 @@ public void testWatchDogDef() {
493493 LibvirtVMDef .WatchDogDef .WatchDogAction action = LibvirtVMDef .WatchDogDef .WatchDogAction .RESET ;
494494
495495 LibvirtVMDef .WatchDogDef def = new LibvirtVMDef .WatchDogDef (action , model );
496- assertEquals (def .getModel (), model );
497- assertEquals (def .getAction (), action );
496+ assertEquals (model , def .getModel ());
497+ assertEquals (action , def .getAction ());
498498 }
499499
500500 @ Test
@@ -505,6 +505,6 @@ public void testSCSIDef() {
505505 "<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>\n " +
506506 "<driver queues='4'/>\n " +
507507 "</controller>\n " ;
508- assertEquals (str , expected );
508+ assertEquals (expected , str );
509509 }
510510}
0 commit comments