[pypy-svn] r54627 - in pypy/branch/gameboy-emulator/pypy/lang/gameboy: . test
cami at codespeak.net
cami at codespeak.net
Sat May 10 18:32:43 CEST 2008
Author: cami
Date: Sat May 10 18:32:43 2008
New Revision: 54627
Modified:
pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py
pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py
pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py
pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py
Log:
fixed some broken tests
Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py (original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/cartridge.py Sat May 10 18:32:43 2008
@@ -74,7 +74,7 @@
if self.cartridge.has_battery():
self.ram = self.cartridge.read_battery()
- def save(self, cartridgeName):
+ def save(self, cartridge_name):
if self.cartridge.has_battery():
self.cartridge.write_battery(self.ram)
@@ -147,62 +147,63 @@
self.load(file)
def reset(self):
- self.cartridgeName =""
- self.cartridgeFilePath = ""
- self.cartridgeFile = None
- self.batteryName =""
- self.batteryFilePath = ""
- self.batteryFile = None
-
-
- def load(self, cartridgeFilePath):
- self.cartridgeFilePath = str(cartridgeFilePath)
- # self.cartridgeName = os.path.basename(self.cartridgeFilePath)
- self.cartridgeFile = open(self.cartridgeFilePath)
- self._load_battery(self.cartridgeFilePath)
-
-
- def _load_battery(self, cartridgeFilePath):
- self.batteryFilePath = self._create_battery_file_path(cartridgeFilePath)
- self.batteryName = os.path.basename(self.batteryFilePath)
+ self.cartridge_name = None
+ self.cartridge_file_path = None
+ self.cartridge_file = None
+ self.battery_name = None
+ self.battery_file_path = None
+ self.battery_file = None
+
+
+ def load(self, cartridge_file_path):
+ cartridge_file_path = str(cartridge_file_path)
+ self.cartridge_file_path = cartridge_file_path
+ self.cartridge_name = os.path.basename(self.cartridge_file_path)
+ self.cartridge_file = open(cartridge_file_path)
+ self._load_battery(cartridge_file_path)
+
+
+ def _load_battery(self, cartridge_file_path):
+ self.battery_file_path = self._create_battery_file_path(cartridge_file_path)
+ self.battery_name = os.path.basename(self.battery_file_path)
if self.has_battery():
- self.batteryFile = open(self.batteryFilePath)
+ self.battery_file = open(self.battery_file_path)
- def _create_battery_file_path(self, cartridgeFilePath):
- if cartridgeFilePath.endswith(constants.CARTRIDGE_FILE_EXTENSION):
- return cartridgeFilePath.replace(constants.CARTRIDGE_FILE_EXTENSION,
+ def _create_battery_file_path(self, cartridge_file_path):
+ if cartridge_file_path.endswith(constants.CARTRIDGE_FILE_EXTENSION):
+ return cartridge_file_path.replace(constants.CARTRIDGE_FILE_EXTENSION,
constants.BATTERY_FILE_EXTENSION)
- elif cartridgeFilePath.endswith(constants.CARTRIDGE_COLOR_FILE_EXTENSION):
- return cartridgeFilePath.replace(constants.CARTRIDGE_COLOR_FILE_EXTENSION,
+ elif cartridge_file_path.endswith(constants.CARTRIDGE_COLOR_FILE_EXTENSION):
+ return cartridge_file_path.replace(constants.CARTRIDGE_COLOR_FILE_EXTENSION,
constants.BATTERY_FILE_EXTENSION)
else:
- return cartridgeFilePath + constants.BATTERY_FILE_EXTENSION
+ return cartridge_file_path + constants.BATTERY_FILE_EXTENSION
def has_battery(self):
- return os.path.exists(self.batteryFilePath)
+ return os.path.exists(self.battery_file_path)
def read(self):
- self.cartridgeFile.seek(0)
- return map(map_to_byte, self.cartridgeFile.read())
+ self.cartridge_file.seek(0)
+ return map(map_to_byte, self.cartridge_file.read())
def read_battery(self):
- self.batteryFile.seek(0)
- return map(map_to_byte, self.batteryFile.read())
+ self.battery_file.seek(0)
+ return map(map_to_byte, self.battery_file.read())
def write_battery(self, ram):
- self.batteryFile = open(self.batteryFilePath, "w")
- self.batteryFile.write(("").join(map(chr, ram)))
- self.batteryFile = open(self.batteryFilePath, "r+")
+ self.battery_file = open(self.battery_file_path, "w")
+ self.battery_file.write(("").join(map(chr, ram)))
+ self.battery_file = open(self.battery_file_path, "r+")
def remove_battery(self):
if self.has_battery():
- os.remove(self.batteryFilePath)
+ os.remove(self.battery_file_path)
def get_size(self):
- return os.path.getsize(self.cartridgeFilePath)
+ return os.path.getsize(self.cartridge_file_path)
def get_battery_size(self):
- return os.path.getsize(self.batteryFilePath)
+ return os.path.getsize(self.battery_file_path)
Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py (original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/joypad.py Sat May 10 18:32:43 2008
@@ -1,5 +1,6 @@
from pypy.lang.gameboy import constants
+from pypy.lang.gameboy.interrupt import *
class Joypad(object):
"""
@@ -9,6 +10,8 @@
"""
def __init__(self, joypad_driver, interrupt):
+ assert isinstance(joypad_driver, JoypadDriver)
+ assert isinstance(interrupt, Interrupt )
self.driver = joypad_driver
self.interrupt = interrupt
self.reset()
Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py (original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/sound.py Sat May 10 18:32:43 2008
@@ -173,6 +173,7 @@
def __init__(self, sample_rate, frequency_table):
Channel.__init__(self, sample_rate, frequency_table)
+ assert isinstance(sample_rate, int)
self.audio_2_index = 0
self.audio_2_length = 0
self.audio_volume = 0
Modified: pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py
==============================================================================
--- pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py (original)
+++ pypy/branch/gameboy-emulator/pypy/lang/gameboy/test/test_cartridge.py Sat May 10 18:32:43 2008
@@ -43,13 +43,13 @@
def test_cartridge_init():
cartridge = get_cartridge()
- assert cartridge.cartridgeName == ""
- assert cartridge.cartridgeFilePath == ""
- assert cartridge.cartridgeFile == None
-
- assert cartridge.batteryName == ""
- assert cartridge.batteryFilePath == ""
- assert cartridge.batteryFile == None
+ assert cartridge.cartridge_name is None
+ assert cartridge.cartridge_file_path is None
+ assert cartridge.cartridge_file is None
+
+ assert cartridge.battery_name is None
+ assert cartridge.battery_file_path is None
+ assert cartridge.battery_file is None
def rest_cartridge_load():
@@ -58,14 +58,14 @@
romFilePath = ROM_PATH+"/rom1/"+romName
cartridge.load(romFilePath)
- assert cartridge.cartridgeName == romName
- assert cartridge.cartridgeFilePath == romFilePath
- assert cartridge.cartridgeFile != None
+ assert cartridge.cartridge_name == romName
+ assert cartridge.cartridge_file_path == romFilePath
+ assert cartridge.cartridge_file is not None
- assert cartridge.batteryName == romFile+constants.BATTERY_FILE_EXTENSION
- assert cartridge.batteryFilePath == romFilePath+constants.BATTERY_FILE_EXTENSION
+ assert cartridge.battery_name == romFile+constants.BATTERY_FILE_EXTENSION
+ assert cartridge.battery_file_path == romFilePath+constants.BATTERY_FILE_EXTENSION
assert cartridge.has_battery() == False
- assert cartridge.batteryFile == None
+ assert cartridge.battery_file is None
def test_cartridge_hasBattery():
@@ -80,7 +80,7 @@
def test_cartridge_read():
cartridge = get_cartridge()
- cartridge.cartridgeFile = File(CONTENT)
+ cartridge.cartridge_file = File(CONTENT)
assert cartridge.read() == MAPPED_CONTENT
@@ -97,8 +97,8 @@
cartridge.write_battery(MAPPED_CONTENT)
assert cartridge.has_battery() == True
- print cartridge.batteryFile
- assert cartridge.batteryFile.read() == CONTENT
+ print cartridge.battery_file
+ assert cartridge.battery_file.read() == CONTENT
assert cartridge.read_battery() == MAPPED_CONTENT
cartridge.remove_battery()
More information about the Pypy-commit
mailing list