batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added comments

Browse source
This commit is contained in:
Batuhan Berk Başoğlu 2018-11-16 12:30:21 -05:00
parent 4c2c67be68
commit 22d678be9e
3 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
OlympusServices/.idea/caches/build_file_checksums.ser generated
View file

Binary file not shown.

24
OlympusServices/.idea/codeStyles/Project.xml generated
View file

@ -49,29 +49,5 @@
<pair source="c" header="h" fileNamingConvention="NONE" /> <pair source="c" header="h" fileNamingConvention="NONE" />
</extensions> </extensions>
</Objective-C-extensions> </Objective-C-extensions>
<DBN-PSQL>
<case-options enabled="false">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false" />
</DBN-PSQL>
<DBN-SQL>
<case-options enabled="false">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false">
<option name="STATEMENT_SPACING" value="one_line" />
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings>
</DBN-SQL>
</code_scheme> </code_scheme>
</component> </component>

7
OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/ServiceProviderTest2.java
View file

@ -8,6 +8,9 @@ public class ServiceProviderTest2 {
ServiceProvider serviceprovider = new ServiceProvider("John123", "1234567890", "John", "Doe", ServiceProvider serviceprovider = new ServiceProvider("John123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true); "testaddress", "8888888888", "companydotcom", true);
/**
* sets availabilities and tests them.
*/
@Test @Test
public void testAvailabilities() { public void testAvailabilities() {
int [][] availability = new int[7][4]; int [][] availability = new int[7][4];
@ -20,6 +23,10 @@ public class ServiceProviderTest2 {
assertEquals( availability, serviceprovider.getAvailabilities()); assertEquals( availability, serviceprovider.getAvailabilities());
} }
/**
* Tests other instances and checks if they are correct
*
*/
@Test @Test
public void testOtherInstances() { public void testOtherInstances() {
assertEquals( "testaddress", serviceprovider.getAddress() ); assertEquals( "testaddress", serviceprovider.getAddress() );