Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Commit 9411563

Browse files
author
Irene
committed
Fix tests
1 parent 0853bb2 commit 9411563

12 files changed

Lines changed: 63 additions & 89 deletions

File tree

‎pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<maven.compiler.source>1.8</maven.compiler.source>
1111
<maven.compiler.target>1.8</maven.compiler.target>
12-
<powermock.version>1.5.1</powermock.version>
12+
<powermock.version>1.6.2</powermock.version>
1313
</properties>
1414

1515
<repositories>
@@ -63,6 +63,7 @@
6363
<groupId>org.mockito</groupId>
6464
<artifactId>mockito-all</artifactId>
6565
<version>1.10.19</version>
66+
<scope>test</scope>
6667
</dependency>
6768
<dependency>
6869
<groupId>commons-io</groupId>
@@ -181,6 +182,9 @@
181182
<artifactId>cobertura-maven-plugin</artifactId>
182183
<version>2.7</version>
183184
<configuration>
185+
<check>
186+
187+
</check>
184188
<formats>
185189
<format>xml</format>
186190
<format>html</format>
@@ -204,9 +208,7 @@
204208
<encoding>UTF-8</encoding>
205209
<linkXRef>false</linkXRef>
206210
<failOnViolation>true</failOnViolation>
207-
<configuration>
208211
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
209-
</configuration>
210212
</configuration>
211213
<dependencies>
212214
<dependency>
@@ -257,6 +259,7 @@
257259

258260
<profiles>
259261
<profile>
262+
<id>dev</id>
260263
<activation>
261264
<os>
262265
<family>!windows</family>

‎src/main/java/fi/helsinki/cs/tmc/cli/backend/Account.java‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,19 @@ public Optional<OauthCredentials> getOauthCredentials() {
6969
}
7070

7171
public void setOauthCredentials(Optional<OauthCredentials> oauthCredentials) {
72-
if (oauthCredentials.isPresent()) {
73-
this.oauthCredentials = oauthCredentials.get();
74-
} else {
75-
this.oauthCredentials = null;
76-
}
72+
this.oauthCredentials = oauthCredentials.orNull();
7773
}
7874

7975
public void setPassword(Optional<String> password) {
80-
if (password.isPresent()) {
81-
this.password = password.get();
82-
} else {
83-
this.password = null;
84-
}
76+
this.password = password.orNull();
8577
}
8678

8779
public Optional<String> getoAuthToken() {
8880
return Optional.of(this.token);
8981
}
9082

9183
public void setoAuthToken(Optional<String> token) {
92-
if (token.isPresent()) {
93-
this.token = token.get();
94-
} else {
95-
this.token = null;
96-
}
84+
this.token= token.orNull();
9785
}
9886

9987
public Optional<Course> getCurrentCourse() {
@@ -113,23 +101,14 @@ public String toString() {
113101
}
114102

115103
public void setCurrentCourse(Optional<Course> currentCourse) {
116-
if (currentCourse.isPresent()) {
117-
this.currentCourse = currentCourse.get();
118-
} else {
119-
this.currentCourse = null;
120-
}
121-
104+
this.currentCourse = currentCourse.orNull();
122105
}
123106

124107
public Optional<Organization> getOrganization() {
125108
return Optional.fromNullable(this.organization);
126109
}
127110

128111
public void setOrganization(Optional<Organization> organization) {
129-
if (organization.isPresent()) {
130-
this.organization = organization.get();
131-
} else {
132-
this.organization = null;
133-
}
112+
this.organization = organization.orNull();
134113
}
135114
}

‎src/main/java/fi/helsinki/cs/tmc/cli/backend/CourseInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class CourseInfo {
1919
private HashMap<String, String> properties;
2020

2121
public CourseInfo(Account account, Course course) {
22-
this.username = account.getUsername().get();
23-
this.serverAddress = account.getServerAddress().get();
22+
this.username = account.getUsername().orNull();
23+
this.serverAddress = account.getServerAddress().orNull();
2424
this.course = course;
2525
this.properties = new HashMap<>();
2626
this.localCompletedExercises = new ArrayList<>();

‎src/main/java/fi/helsinki/cs/tmc/cli/backend/Settings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Optional<String> getUsername() {
7979

8080
@Override
8181
public boolean userDataExists() {
82-
return getUsername() != null && getPassword() != null;
82+
return getUsername().isPresent() && getPassword().isPresent();
8383
}
8484

8585
@Override
@@ -102,7 +102,7 @@ public String getFormattedUserData() {
102102
if (!userDataExists()) {
103103
return "";
104104
}
105-
return getUsername() + ":" + this.getPassword();
105+
return getUsername().get() + ":" + this.getPassword().get();
106106
}
107107

108108
@Override

‎src/main/java/fi/helsinki/cs/tmc/cli/backend/TmcUtil.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
1616
import fi.helsinki.cs.tmc.langs.domain.RunResult;
1717

18+
import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
1819
import org.slf4j.Logger;
1920
import org.slf4j.LoggerFactory;
2021

@@ -240,11 +241,8 @@ private static void handleTmcExceptions(CliContext ctx, Exception exception) {
240241

241242
private static boolean isAuthenticationError(Exception exception) {
242243
Throwable cause = exception.getCause();
243-
if (cause instanceof FailedHttpResponseException) {
244-
FailedHttpResponseException httpEx = (FailedHttpResponseException) cause;
245-
if (httpEx.getStatusCode() == 401) {
244+
if (cause instanceof OAuthProblemException) {
246245
return true;
247-
}
248246
}
249247
return false;
250248
}

‎src/main/java/fi/helsinki/cs/tmc/cli/command/ListCoursesCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public void run(CliContext context, CommandLine args) {
5757
if (!isFirst) {
5858
io.println();
5959
}
60-
if (accountsList.getAccountCount() > 1) {
60+
if (accountsList.getAccountCount() > 1 && settings.getServerAddress().isPresent()) {
6161
io.println(
6262
ColorUtil.colorString(
63-
"Server " + settings.getServerAddress(), Color.YELLOW));
63+
"Server " + settings.getServerAddress().get(), Color.YELLOW));
6464
}
6565

6666
printCourseList(settings);

‎src/main/java/fi/helsinki/cs/tmc/cli/shared/CourseFinder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ private boolean handleMultipleMatchingCourses(Map<Account, Course> matches) {
8686

8787
if (io.readConfirmation(
8888
"Download course from "
89-
+ entryAccount.getServerAddress()
89+
+ entryAccount.getServerAddress().get()
9090
+ " with '"
91-
+ entryAccount.getUsername()
91+
+ entryAccount.getUsername().get()
9292
+ "' account",
9393
false)) {
9494
this.account = entryAccount;

‎src/test/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoIoTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fi.helsinki.cs.tmc.cli.backend;
22

3+
import fi.helsinki.cs.tmc.cli.io.WorkDir;
34
import fi.helsinki.cs.tmc.core.domain.Course;
45

56
import junit.framework.Assert;
@@ -8,11 +9,14 @@
89
import org.junit.Before;
910
import org.junit.Test;
1011

12+
import java.io.File;
1113
import java.io.IOException;
1214
import java.nio.file.Files;
1315
import java.nio.file.Path;
1416
import java.nio.file.Paths;
1517

18+
import static org.junit.Assert.assertTrue;
19+
1620
public class CourseInfoIoTest {
1721

1822
private CourseInfo course;
@@ -53,4 +57,15 @@ public void loadingFromFileWorks() {
5357
Assert.assertEquals(this.course.getUsername(), loadedInfo.getUsername());
5458
Assert.assertEquals(this.course.getCourseName(), loadedInfo.getCourseName());
5559
}
60+
61+
@Test
62+
public void abortingCourseCreationWorks() {
63+
CourseInfoIo.save(this.course, this.courseFile);
64+
CourseInfo loadedInfo = CourseInfoIo.load(this.courseFile);
65+
Assert.assertNotNull(loadedInfo);
66+
67+
CourseInfoIo.abortCreatingCourse(new Course("test-course"), Paths.get(tempDir));
68+
File courseJson = Paths.get(tempDir).resolve(".tmc.json").toFile();
69+
assertTrue(!courseJson.exists());
70+
}
5671
}

‎src/test/java/fi/helsinki/cs/tmc/cli/backend/SettingsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public void setUp() {
2323
@Test
2424
public void constructorInitializesFields() {
2525
assertEquals("testserver", settings.getServerAddress());
26-
assertEquals("testuser", settings.getUsername());
27-
assertEquals("testpassword", settings.getPassword());
26+
assertEquals("testuser", settings.getUsername().get());
27+
assertEquals("testpassword", settings.getPassword().get());
2828
}
2929

3030
@Test

‎src/test/java/fi/helsinki/cs/tmc/cli/backend/TmcUtilTest.java‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@
3232
import fi.helsinki.cs.tmc.langs.domain.RunResult;
3333

3434
import org.apache.http.entity.BasicHttpEntity;
35+
import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
3536
import org.junit.Before;
3637
import org.junit.Test;
3738
import org.junit.runner.RunWith;
3839
import org.mockito.invocation.InvocationOnMock;
3940
import org.mockito.stubbing.Answer;
41+
import org.omg.PortableInterceptor.ServerRequestInfo;
4042
import org.powermock.api.mockito.PowerMockito;
4143
import org.powermock.core.classloader.annotations.PrepareForTest;
4244
import org.powermock.modules.junit4.PowerMockRunner;
@@ -60,6 +62,9 @@ public class TmcUtilTest {
6062
private CliContext ctx;
6163
private TestIo io;
6264
private TmcCore mockCore;
65+
private static String SERVER = "server";
66+
private static String USERNAME = "username";
67+
private static String PASSWORD = "password";
6368

6469
@Before
6570
public void setUp() {
@@ -130,47 +135,10 @@ public void hasNoInternetConnection() throws UnknownHostException {
130135
public void failToLogin() throws URISyntaxException {
131136
when(mockCore.listCourses(any(ProgressObserver.class)))
132137
.thenReturn(createThrowingCallbackOfList(Course.class, "failed"));
133-
Account account = new Account();
138+
Account account = new Account(SERVER, USERNAME, PASSWORD);
134139
assertFalse(TmcUtil.tryToLogin(ctx, account, ""));
135140
}
136141

137-
@Test
138-
public void loginCatchesObsoleteClientException() {
139-
Callable<List<Course>> callable =
140-
new Callable<List<Course>>() {
141-
@Override
142-
public List<Course> call() throws Exception {
143-
Exception exception = new ObsoleteClientException();
144-
throw new Exception(exception);
145-
}
146-
};
147-
148-
Application app = mock(Application.class);
149-
ctx.setApp(app);
150-
when(app.runAutoUpdate()).thenReturn(true);
151-
when(mockCore.listCourses(any(ProgressObserver.class))).thenReturn(callable);
152-
TmcUtil.tryToLogin(ctx, new Account(), "");
153-
io.assertContains("Your tmc-cli is outdated");
154-
verify(app, times(1)).runAutoUpdate();
155-
}
156-
157-
@Test
158-
public void loginCatchesFailedHttpResponseException() {
159-
Callable<List<Course>> callable =
160-
new Callable<List<Course>>() {
161-
@Override
162-
public List<Course> call() throws Exception {
163-
Exception exception =
164-
new FailedHttpResponseException(401, new BasicHttpEntity());
165-
throw new Exception(exception);
166-
}
167-
};
168-
169-
when(mockCore.listCourses(any(ProgressObserver.class))).thenReturn(callable);
170-
TmcUtil.tryToLogin(ctx, new Account(), "");
171-
io.assertContains("Incorrect username or password");
172-
}
173-
174142
@Test
175143
public void listCourses() {
176144
List<Course> expectedResult =

0 commit comments

Comments
 (0)