Skip to content

Commit

Permalink
Merge branch 'release/3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
dktapps committed Dec 29, 2018
2 parents 23954c4 + beb5d72 commit 10ac322
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/pocketmine/level/format/io/region/RegionLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RegionLoader{
public const COMPRESSION_GZIP = 1;
public const COMPRESSION_ZLIB = 2;

private const MAX_SECTOR_LENGTH = 256 << 12; //256 sectors, (1 MiB)
private const MAX_SECTOR_LENGTH = 255 << 12; //255 sectors (~0.996 MiB)
private const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps

public static $COMPRESSION_LEVEL = 7;
Expand Down
52 changes: 52 additions & 0 deletions tests/phpunit/level/format/io/region/RegionLoaderTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php

/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/

declare(strict_types=1);

namespace pocketmine\level\format\io\region;

use PHPUnit\Framework\TestCase;
use pocketmine\level\format\ChunkException;

class RegionLoaderTest extends TestCase{

public function testChunkTooBig() : void{
$r = new RegionLoader(sys_get_temp_dir() . '/chunk_too_big.testregion_' . bin2hex(random_bytes(4)));
$r->open();

$this->expectException(ChunkException::class);
$r->writeChunk(0, 0, str_repeat("a", 1044476));
}

public function testChunkMaxSize() : void{
$data = str_repeat("a", 1044475);
$path = sys_get_temp_dir() . '/chunk_just_fits.testregion_' . bin2hex(random_bytes(4));
$r = new RegionLoader($path);
$r->open();

$r->writeChunk(0, 0, $data);
$r->close();

$r = new RegionLoader($path);
$r->open();
self::assertSame($data, $r->readChunk(0, 0));
}
}

0 comments on commit 10ac322

Please sign in to comment.