Skip to content

Commit cbdb5e3

Browse files
yhildebrandtbheisig
yhildebrandt
authored and
bheisig
committed
Fixed a few failing tests
1 parent 8c1fe92 commit cbdb5e3

7 files changed

Lines changed: 68 additions & 99 deletions

File tree

‎src/Console/Import.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,6 @@ public function triggerJDiscDiscovery(array $options = []): array {
112112
);
113113
}
114114

115-
/**
116-
* Import data from OCS Inventory NG instance
117-
*
118-
* @param array $options Options
119-
*
120-
* @return array Output (one value per line)
121-
*
122-
* @throws Exception on error
123-
*/
124-
public function importFromOCSInventoryNG(array $options = []): array {
125-
return $this->execute(
126-
'console.import.ocs',
127-
$options
128-
);
129-
}
130-
131115
/**
132116
* Import data from syslog
133117
*

‎tests/Idoit/APIClient/CMDBDialogTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public function testCreateWithoutParent() {
251251
$this->assertArrayHasKey('const', $entry['parent']);
252252
$this->assertEmpty($entry['parent']['const']);
253253
$this->assertArrayHasKey('title', $entry['parent']);
254-
$this->assertNull($entry['parent']['title']);
254+
$this->assertEmpty($entry['parent']['title']);
255255
}
256256

257257
/**

‎tests/Idoit/APIClient/Console/ConsoleTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public function provideBlacklistedCommands(): array {
101101
'' => ['console.tenant.add'],
102102
'console.tenant.add' => ['console.tenant.disable'],
103103
'console.tenant.enable' => ['console.tenant.enable'],
104-
'console.tenant.list' => ['console.tenant.list'],
105104
];
106105
}
107106

@@ -116,5 +115,4 @@ public function testExecuteBlacklistedCommand(string $blacklistedCommand) {
116115
$result = $this->console->execute($blacklistedCommand);
117116
$this->assertIsArray($result);
118117
}
119-
120118
}

‎tests/Idoit/APIClient/Console/ImportTest.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,6 @@ public function testImportFromHInventory() {
102102
// $this->isOutput($result);
103103
// }
104104

105-
/**
106-
* @throws Exception on error
107-
*/
108-
public function testImportFromOCSInventoryNG() {
109-
$result = $this->import->importFromOCSInventoryNG();
110-
111-
$this->assertIsArray($result);
112-
$this->isOutput($result);
113-
}
114-
115105
/**
116106
* @throws Exception on error
117107
*/

‎tests/Idoit/APIClient/Issues/API131Test.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ public function testOrganization() {
218218

219219
$entry = $this->useCMDBCategory()->readFirst($objectID, $categoryConstant);
220220

221+
print_r($entry);
222+
221223
$this->assertIsArray($entry);
222224
$this->assertArrayHasKey('id', $entry);
223225
$this->isIDAsString($entry['id']);

‎tests/Idoit/APIClient/Issues/API30Test.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testIssue() {
109109
$hostAID,
110110
Category::CATG__CONNECTOR,
111111
[
112-
// … before selecting wich wire is rx/tx:
112+
// … before selecting which wire is rx/tx:
113113
'used_fiber_lead_rx' => $rxID,
114114
'used_fiber_lead_tx' => $txID
115115
],

‎tests/Idoit/APIClient/Issues/API7Test.php‎

Lines changed: 64 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,22 @@ public function testIssue() {
125125
$this->assertSame($portA['connector'], $portsA[0]['connector']);
126126
$this->assertArrayHasKey('assigned_connector', $portsA[0]);
127127
$this->assertIsArray($portsA[0]['assigned_connector']);
128-
$this->assertArrayHasKey(0, $portsA[0]['assigned_connector']);
129-
$this->assertIsArray($portsA[0]['assigned_connector'][0]);
130-
$this->assertArrayHasKey('name', $portsA[0]['assigned_connector'][0]);
131-
$this->assertIsString($portsA[0]['assigned_connector'][0]['name']);
132-
$this->assertSame($portBTitle, $portsA[0]['assigned_connector'][0]['name']);
133-
$this->assertArrayHasKey('id', $portsA[0]['assigned_connector'][0]);
134-
$this->isIDAsString($portsA[0]['assigned_connector'][0]['id']);
135-
$this->assertSame($switchBID, (int) $portsA[0]['assigned_connector'][0]['id']);
136-
$this->assertArrayHasKey('title', $portsA[0]['assigned_connector'][0]);
137-
$this->assertIsString($portsA[0]['assigned_connector'][0]['title']);
138-
$this->assertSame($switchBTitle, $portsA[0]['assigned_connector'][0]['title']);
139-
$this->assertArrayHasKey('type', $portsA[0]['assigned_connector'][0]);
140-
$this->assertIsString($portsA[0]['assigned_connector'][0]['type']);
141-
$this->assertSame($objectType, $portsA[0]['assigned_connector'][0]['type']);
142-
$this->assertArrayHasKey('assigned_category', $portsA[0]['assigned_connector'][0]);
143-
$this->assertIsString($portsA[0]['assigned_connector'][0]['assigned_category']);
144-
$this->assertSame($categoryConstant, $portsA[0]['assigned_connector'][0]['assigned_category']);
128+
$this->assertIsArray($portsA[0]['assigned_connector']);
129+
$this->assertArrayHasKey('name', $portsA[0]['assigned_connector']);
130+
$this->assertIsString($portsA[0]['assigned_connector']['name']);
131+
$this->assertSame($portBTitle, $portsA[0]['assigned_connector']['name']);
132+
$this->assertArrayHasKey('id', $portsA[0]['assigned_connector']);
133+
$this->isIDAsString($portsA[0]['assigned_connector']['id']);
134+
$this->assertSame($switchBID, (int) $portsA[0]['assigned_connector']['id']);
135+
$this->assertArrayHasKey('title', $portsA[0]['assigned_connector']);
136+
$this->assertIsString($portsA[0]['assigned_connector']['title']);
137+
$this->assertSame($switchBTitle, $portsA[0]['assigned_connector']['title']);
138+
$this->assertArrayHasKey('type', $portsA[0]['assigned_connector']);
139+
$this->assertIsString($portsA[0]['assigned_connector']['type']);
140+
$this->assertSame($objectType, $portsA[0]['assigned_connector']['type']);
141+
$this->assertArrayHasKey('assigned_category', $portsA[0]['assigned_connector']);
142+
$this->assertIsString($portsA[0]['assigned_connector']['assigned_category']);
143+
$this->assertSame($categoryConstant, $portsA[0]['assigned_connector']['assigned_category']);
145144

146145
$connectorsA = $this->useCMDBCategory()->read($switchAID, Category::CATG__CONNECTOR);
147146

@@ -161,23 +160,22 @@ public function testIssue() {
161160
$this->isIDAsString($connectorsA[0]['assigned_category']['value']);
162161
$this->assertArrayHasKey('assigned_connector', $connectorsA[0]);
163162
$this->assertIsArray($connectorsA[0]['assigned_connector']);
164-
$this->assertArrayHasKey(0, $connectorsA[0]['assigned_connector']);
165-
$this->assertIsArray($connectorsA[0]['assigned_connector'][0]);
166-
$this->assertArrayHasKey('name', $connectorsA[0]['assigned_connector'][0]);
167-
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['name']);
168-
$this->assertSame($portBTitle, $connectorsA[0]['assigned_connector'][0]['name']);
169-
$this->assertArrayHasKey('id', $connectorsA[0]['assigned_connector'][0]);
170-
$this->isIDAsString($connectorsA[0]['assigned_connector'][0]['id']);
171-
$this->assertSame($switchBID, (int) $connectorsA[0]['assigned_connector'][0]['id']);
172-
$this->assertArrayHasKey('title', $connectorsA[0]['assigned_connector'][0]);
173-
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['title']);
174-
$this->assertSame($switchBTitle, $connectorsA[0]['assigned_connector'][0]['title']);
175-
$this->assertArrayHasKey('type', $connectorsA[0]['assigned_connector'][0]);
176-
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['type']);
177-
$this->assertSame($objectType, $connectorsA[0]['assigned_connector'][0]['type']);
178-
$this->assertArrayHasKey('assigned_category', $connectorsA[0]['assigned_connector'][0]);
179-
$this->assertIsString($connectorsA[0]['assigned_connector'][0]['assigned_category']);
180-
$this->assertSame($categoryConstant, $connectorsA[0]['assigned_connector'][0]['assigned_category']);
163+
$this->assertIsArray($connectorsA[0]['assigned_connector']);
164+
$this->assertArrayHasKey('name', $connectorsA[0]['assigned_connector']);
165+
$this->assertIsString($connectorsA[0]['assigned_connector']['name']);
166+
$this->assertSame($portBTitle, $connectorsA[0]['assigned_connector']['name']);
167+
$this->assertArrayHasKey('id', $connectorsA[0]['assigned_connector']);
168+
$this->isIDAsString($connectorsA[0]['assigned_connector']['id']);
169+
$this->assertSame($switchBID, (int) $connectorsA[0]['assigned_connector']['id']);
170+
$this->assertArrayHasKey('title', $connectorsA[0]['assigned_connector']);
171+
$this->assertIsString($connectorsA[0]['assigned_connector']['title']);
172+
$this->assertSame($switchBTitle, $connectorsA[0]['assigned_connector']['title']);
173+
$this->assertArrayHasKey('type', $connectorsA[0]['assigned_connector']);
174+
$this->assertIsString($connectorsA[0]['assigned_connector']['type']);
175+
$this->assertSame($objectType, $connectorsA[0]['assigned_connector']['type']);
176+
$this->assertArrayHasKey('assigned_category', $connectorsA[0]['assigned_connector']);
177+
$this->assertIsString($connectorsA[0]['assigned_connector']['assigned_category']);
178+
$this->assertSame($categoryConstant, $connectorsA[0]['assigned_connector']['assigned_category']);
181179

182180
// …and switch B:
183181
$portsB = $this->useCMDBCategory()->read($switchBID, $categoryConstant);
@@ -199,23 +197,22 @@ public function testIssue() {
199197
$this->assertSame($portB['connector'], $portsB[0]['connector']);
200198
$this->assertArrayHasKey('assigned_connector', $portsB[0]);
201199
$this->assertIsArray($portsB[0]['assigned_connector']);
202-
$this->assertArrayHasKey(0, $portsB[0]['assigned_connector']);
203-
$this->assertIsArray($portsB[0]['assigned_connector'][0]);
204-
$this->assertArrayHasKey('name', $portsB[0]['assigned_connector'][0]);
205-
$this->assertIsString($portsB[0]['assigned_connector'][0]['name']);
206-
$this->assertSame($portATitle, $portsB[0]['assigned_connector'][0]['name']);
207-
$this->assertArrayHasKey('id', $portsB[0]['assigned_connector'][0]);
208-
$this->isIDAsString($portsB[0]['assigned_connector'][0]['id']);
209-
$this->assertSame($switchAID, (int) $portsB[0]['assigned_connector'][0]['id']);
210-
$this->assertArrayHasKey('title', $portsB[0]['assigned_connector'][0]);
211-
$this->assertIsString($portsB[0]['assigned_connector'][0]['title']);
212-
$this->assertSame($switchATitle, $portsB[0]['assigned_connector'][0]['title']);
213-
$this->assertArrayHasKey('type', $portsB[0]['assigned_connector'][0]);
214-
$this->assertIsString($portsB[0]['assigned_connector'][0]['type']);
215-
$this->assertSame($objectType, $portsB[0]['assigned_connector'][0]['type']);
216-
$this->assertArrayHasKey('assigned_category', $portsB[0]['assigned_connector'][0]);
217-
$this->assertIsString($portsB[0]['assigned_connector'][0]['assigned_category']);
218-
$this->assertSame($categoryConstant, $portsB[0]['assigned_connector'][0]['assigned_category']);
200+
$this->assertIsArray($portsB[0]['assigned_connector']);
201+
$this->assertArrayHasKey('name', $portsB[0]['assigned_connector']);
202+
$this->assertIsString($portsB[0]['assigned_connector']['name']);
203+
$this->assertSame($portATitle, $portsB[0]['assigned_connector']['name']);
204+
$this->assertArrayHasKey('id', $portsB[0]['assigned_connector']);
205+
$this->isIDAsString($portsB[0]['assigned_connector']['id']);
206+
$this->assertSame($switchAID, (int) $portsB[0]['assigned_connector']['id']);
207+
$this->assertArrayHasKey('title', $portsB[0]['assigned_connector']);
208+
$this->assertIsString($portsB[0]['assigned_connector']['title']);
209+
$this->assertSame($switchATitle, $portsB[0]['assigned_connector']['title']);
210+
$this->assertArrayHasKey('type', $portsB[0]['assigned_connector']);
211+
$this->assertIsString($portsB[0]['assigned_connector']['type']);
212+
$this->assertSame($objectType, $portsB[0]['assigned_connector']['type']);
213+
$this->assertArrayHasKey('assigned_category', $portsB[0]['assigned_connector']);
214+
$this->assertIsString($portsB[0]['assigned_connector']['assigned_category']);
215+
$this->assertSame($categoryConstant, $portsB[0]['assigned_connector']['assigned_category']);
219216

220217
$connectorsB = $this->useCMDBCategory()->read($switchBID, Category::CATG__CONNECTOR);
221218

@@ -235,23 +232,21 @@ public function testIssue() {
235232
$this->isIDAsString($connectorsB[0]['assigned_category']['value']);
236233
$this->assertArrayHasKey('assigned_connector', $connectorsB[0]);
237234
$this->assertIsArray($connectorsB[0]['assigned_connector']);
238-
$this->assertArrayHasKey(0, $connectorsB[0]['assigned_connector']);
239-
$this->assertIsArray($connectorsB[0]['assigned_connector'][0]);
240-
$this->assertArrayHasKey('name', $connectorsB[0]['assigned_connector'][0]);
241-
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['name']);
242-
$this->assertSame($portATitle, $connectorsB[0]['assigned_connector'][0]['name']);
243-
$this->assertArrayHasKey('id', $connectorsB[0]['assigned_connector'][0]);
244-
$this->isIDAsString($connectorsB[0]['assigned_connector'][0]['id']);
245-
$this->assertSame($switchAID, (int) $connectorsB[0]['assigned_connector'][0]['id']);
246-
$this->assertArrayHasKey('title', $connectorsB[0]['assigned_connector'][0]);
247-
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['title']);
248-
$this->assertSame($switchATitle, $connectorsB[0]['assigned_connector'][0]['title']);
249-
$this->assertArrayHasKey('type', $connectorsB[0]['assigned_connector'][0]);
250-
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['type']);
251-
$this->assertSame($objectType, $connectorsB[0]['assigned_connector'][0]['type']);
252-
$this->assertArrayHasKey('assigned_category', $connectorsB[0]['assigned_connector'][0]);
253-
$this->assertIsString($connectorsB[0]['assigned_connector'][0]['assigned_category']);
254-
$this->assertSame($categoryConstant, $connectorsB[0]['assigned_connector'][0]['assigned_category']);
235+
$this->assertIsArray($connectorsB[0]['assigned_connector']);
236+
$this->assertArrayHasKey('name', $connectorsB[0]['assigned_connector']);
237+
$this->assertIsString($connectorsB[0]['assigned_connector']['name']);
238+
$this->assertSame($portATitle, $connectorsB[0]['assigned_connector']['name']);
239+
$this->assertArrayHasKey('id', $connectorsB[0]['assigned_connector']);
240+
$this->isIDAsString($connectorsB[0]['assigned_connector']['id']);
241+
$this->assertSame($switchAID, (int) $connectorsB[0]['assigned_connector']['id']);
242+
$this->assertArrayHasKey('title', $connectorsB[0]['assigned_connector']);
243+
$this->assertIsString($connectorsB[0]['assigned_connector']['title']);
244+
$this->assertSame($switchATitle, $connectorsB[0]['assigned_connector']['title']);
245+
$this->assertArrayHasKey('type', $connectorsB[0]['assigned_connector']);
246+
$this->assertIsString($connectorsB[0]['assigned_connector']['type']);
247+
$this->assertSame($objectType, $connectorsB[0]['assigned_connector']['type']);
248+
$this->assertArrayHasKey('assigned_category', $connectorsB[0]['assigned_connector']);
249+
$this->assertIsString($connectorsB[0]['assigned_connector']['assigned_category']);
250+
$this->assertSame($categoryConstant, $connectorsB[0]['assigned_connector']['assigned_category']);
255251
}
256-
257252
}

0 commit comments

Comments
 (0)