tc_prodos_disks.rb in dsktool-0.4.2

- old
+ new

@@ -37,22 +37,22 @@
 	def test_dos_interleave_prodos_disks
 
 		dskname=File.dirname(__FILE__)+"//ADTPRO-1.0.1.DSK"
 		dsk=DSK.read(dskname)
 		assert_equal(:prodos,dsk.file_system,"#{dskname} should have ProDOS file system")
-		assert_equal(:prodos_from_dos,dsk.sector_order,"#{dskname} should have DOS sector order")
+		assert_equal(:dos,dsk.sector_order,"#{dskname} should have DOS sector order")
 		assert_equal("ADTPRO.1.0.1",dsk.volume_name)
 
 		assert(dsk.files.length>0,"#{dskname} should have at least one file")
 		bas_file=dsk.files["STARTUP"]
 		assert(bas_file!=nil,"#{dskname} should have a file called STARTUP")
 		assert_equal("10 TEXT : NORMAL : HOME",bas_file.to_s[0..22],"STARTUP should detokenise")
 		
 		dskname=File.dirname(__FILE__)+"//Apple Works V5.0 (1993)(Beagle Bros)(Disks 5 of 6).dsk.gz"
 		dsk=DSK.read(dskname)
 		assert_equal(:prodos,dsk.file_system,"#{dskname} should have ProDOS file system")
-		assert_equal(:prodos_from_dos,dsk.sector_order,"#{dskname} should have DOS sector order")
+		assert_equal(:dos,dsk.sector_order,"#{dskname} should have DOS sector order")
 		assert_equal("MOVE13",dsk.volume_name)
 
 		assert(dsk.files.length>0,"#{dskname} should have at least one file")
 #		puts dsk.dump_catalog
 		awp_file=dsk.files["AW.INITS/NARNIA.KNAVES"]
@@ -63,10 +63,10 @@
 	
 	def test_tree_structures
 		dskname=File.dirname(__FILE__)+"//Geos (1988)(Berkeley Softworks)(Disk 1 of 4 Side A).dsk.gz"
 		dsk=DSK.read(dskname)
 		assert_equal(:prodos,dsk.file_system,"#{dskname} should have ProDOS file system")
-		assert_equal(:prodos_from_dos,dsk.sector_order,"#{dskname} should have DOS sector order")
+		assert_equal(:dos,dsk.sector_order,"#{dskname} should have DOS sector order")
 		assert_equal("GEOS.BOOT",dsk.volume_name)
 
 		assert(dsk.files.length>0,"#{dskname} should have at least one file")
 		tree_file=dsk.files["SYSTEM/Mouse"]
 		assert(tree_file!=nil,"#{dskname} should have a file called SYSTEM/Mouse")