Skip to content

Commit

Permalink
GitHub #88 - Add test, standardize model names
Browse files Browse the repository at this point in the history
sqmk committed Dec 27, 2014

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 97114c8 commit cdd70d0
Showing 15 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue bulb A19
*/
class ModelLct001 extends AbstractLightModel
class Lct001Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue Spot BR30
*/
class ModelLct002 extends AbstractLightModel
class Lct002Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue Spot GU10
*/
class ModelLct003 extends AbstractLightModel
class Lct003Model extends AbstractLightModel
{
/**
* Model id
10 changes: 5 additions & 5 deletions library/Phue/LightModel/LightModelFactory.php
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@ class LightModelFactory
*/
public static function build($modelId)
{
$classNamePrefix = __NAMESPACE__ . '\Model';
$classNameModelSuffix = ucfirst(strtolower($modelId));
$classNamePrefix = __NAMESPACE__ . '\\';
$classNameModel = ucfirst(strtolower($modelId)) . 'Model';

if (!class_exists($classNamePrefix . $classNameModelSuffix)) {
$classNameModelSuffix = 'Unknown';
if (!class_exists($classNamePrefix . $classNameModel)) {
$classNameModel = 'UnknownModel';
}

$finalClassName = $classNamePrefix . $classNameModelSuffix;
$finalClassName = $classNamePrefix . $classNameModel;

return new $finalClassName;
}
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Living Colors Gen3 Iris
*/
class ModelLlc006 extends AbstractLightModel
class Llc006Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Living Colors Gen3 Bloom, Aura
*/
class ModelLlc007 extends AbstractLightModel
class Llc007Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue Living Colors Iris
*/
class ModelLlc010 extends AbstractLightModel
class Llc010Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue Living Colors Bloom
*/
class ModelLlc011 extends AbstractLightModel
class Llc011Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue Living Colors Bloom
*/
class ModelLlc012 extends AbstractLightModel
class Llc012Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Disney Living Colors
*/
class ModelLlc013 extends AbstractLightModel
class Llc013Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Color Light Module
*/
class ModelLlm001 extends AbstractLightModel
class Llm001Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue LightStrips
*/
class ModelLst001 extends AbstractLightModel
class Lst001Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Hue A19 Lux
*/
class ModelLwb004 extends AbstractLightModel
class Lwb004Model extends AbstractLightModel
{
/**
* Model id
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
/**
* Unknown model
*/
class ModelUnknown extends AbstractLightModel
class UnknownModel extends AbstractLightModel
{
/**
* Model id
4 changes: 2 additions & 2 deletions tests/Phue/Test/LightModel/LightModelFactoryTest.php
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ class LightModelFactoryTest extends \PHPUnit_Framework_TestCase
public function testGetUnknownModel()
{
$this->assertInstanceOf(
'\Phue\LightModel\ModelUnknown',
'\Phue\LightModel\UnknownModel',
LightModelFactory::build('whatever')
);
}
@@ -37,7 +37,7 @@ public function testGetUnknownModel()
public function testGetKnownModel()
{
$this->assertInstanceOf(
'\Phue\LightModel\ModelLst001',
'\Phue\LightModel\Lst001Model',
LightModelFactory::build('LST001')
);
}

0 comments on commit cdd70d0

Please sign in to comment.