Skip to content

Build opt #2721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pivovarit merged 3 commits into from
Oct 9, 2017
Merged

Build opt #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1ddc3b
Refactor JettyIntegrationTest
pivovarit Oct 9, 2017
576d7aa
Refactor RxJava samples
pivovarit Oct 9, 2017
e980d23
Refactor RxJava samples
pivovarit Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,26 @@
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import java.nio.charset.StandardCharsets;

import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;

public class JettyIntegrationTest {
private JettyServer jettyServer;
private static JettyServer jettyServer;

@Before
public void setup() throws Exception {
@BeforeClass
public static void setup() throws Exception {
jettyServer = new JettyServer();
jettyServer.start();
}

@After
public void cleanup() throws Exception {
Thread.sleep(2000);
@AfterClass
public static void cleanup() throws Exception {
jettyServer.stop();
}

Expand Down
65 changes: 38 additions & 27 deletions rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.baeldung.rxjava;

import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import rx.Observable;
Expand All @@ -16,9 +15,11 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;

import static com.jayway.awaitility.Awaitility.await;
import static java.util.concurrent.Executors.newFixedThreadPool;
import static org.hamcrest.Matchers.hasItems;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

public class SchedulersTest {
private String result = "";
Expand All @@ -31,7 +32,8 @@ public void givenScheduledWorker_whenScheduleAnAction_thenResultAction() throws
Scheduler scheduler = Schedulers.immediate();
Scheduler.Worker worker = scheduler.createWorker();
worker.schedule(() -> result += "action");
Assert.assertTrue(result.equals("action"));

assertTrue(result.equals("action"));
}

@Test
Expand All @@ -44,8 +46,9 @@ public void givenScheduledWorker_whenUnsubscribeOnWorker_thenResultFirstAction()
worker.unsubscribe();
});
worker.schedule(() -> result += "Second_Action");
Thread.sleep(500);
Assert.assertTrue(result.equals("First_Action"));

await()
.until(() -> assertTrue(result.equals("First_Action")));
}

@Ignore //it's not safe, not every time is running correctly
Expand All @@ -59,8 +62,9 @@ public void givenWorker_whenScheduledOnNewThread_thenResultIsBoundToNewThread()
worker.schedule(() -> result += "_worker_");
result += "_End";
});
Thread.sleep(2000);
Assert.assertTrue(result.equals("RxNewThreadScheduler-1_Start_End_worker_"));

await()
.until(() -> assertTrue(result.equals("RxNewThreadScheduler-1_Start_End_worker_")));
}

@Test
Expand All @@ -75,9 +79,11 @@ public void givenObservable_whenObserveOnNewThread_thenRunOnDifferentThreadEachT
.subscribe(s ->
result1 += Thread.currentThread().getName()
);
Thread.sleep(500);
Assert.assertTrue(result1.equals("RxNewThreadScheduler-1"));
Assert.assertTrue(result2.equals("RxNewThreadScheduler-2"));
await()
.until(() -> {
assertTrue(result1.equals("RxNewThreadScheduler-1"));
assertTrue(result2.equals("RxNewThreadScheduler-2"));
});
}

@Test
Expand All @@ -90,8 +96,9 @@ public void givenWorker_whenScheduledOnImmediate_thenResultIsBoundToThread() thr
worker.schedule(() -> result += "_worker_");
result += "_End";
});
Thread.sleep(500);
Assert.assertTrue(result.equals("main_Start_worker__End"));

await()
.until(() -> assertTrue(result.equals("main_Start_worker__End")));
}

@Test
Expand All @@ -102,8 +109,9 @@ public void givenObservable_whenImmediateScheduled_thenExecuteOnMainThread() thr
.subscribe(s ->
result += Thread.currentThread().getName()
);
Thread.sleep(500);
Assert.assertTrue(result.equals("main"));

await()
.until(() -> assertTrue(result.equals("main")));
}

@Test
Expand All @@ -115,8 +123,9 @@ public void givenObservable_whenTrampolineScheduled_thenExecuteOnMainThread() th
Observable.just(1, 3, 5, 7, 9)
.subscribeOn(Schedulers.trampoline())
.subscribe(i -> result += "" + i);
Thread.sleep(500);
Assert.assertTrue(result.equals("246813579"));

await()
.until(() -> assertTrue(result.equals("246813579")));
}

@Test
Expand All @@ -135,9 +144,9 @@ public void givenWorker_whenScheduledOnTrampoline_thenComposeResultAsBlocking()
});
result += "_mainEnd";
});
Thread.sleep(500);
Assert.assertTrue(result
.equals("mainStart_mainEnd_middleStart_middleEnd_worker_"));

await()
.until(() -> assertTrue(result.equals("mainStart_mainEnd_middleStart_middleEnd_worker_")));
}

private ThreadFactory threadFactory(String pattern) {
Expand All @@ -159,7 +168,6 @@ public void givenExecutors_whenSchedulerFromCreatedExecutors_thenReturnElementsO
subscriber.onNext("Beta");
subscriber.onCompleted();
});
;

observable
.subscribeOn(schedulerA)
Expand All @@ -169,8 +177,9 @@ public void givenExecutors_whenSchedulerFromCreatedExecutors_thenReturnElementsO
Throwable::printStackTrace,
() -> result += "_Completed"
);
Thread.sleep(2000);
Assert.assertTrue(result.equals("Sched-A-0Alfa_Sched-A-0Beta__Completed"));

await()
.until(() -> assertTrue(result.equals("Sched-A-0Alfa_Sched-A-0Beta__Completed")));
}

@Test
Expand All @@ -179,8 +188,9 @@ public void givenObservable_whenIoScheduling_thenReturnThreadName() throws Inter
Observable.just("io")
.subscribeOn(Schedulers.io())
.subscribe(i -> result += Thread.currentThread().getName());
Thread.sleep(500);
Assert.assertTrue(result.equals("RxIoScheduler-2"));

await()
.until(() -> assertTrue(result.equals("RxIoScheduler-2")));
}

@Test
Expand All @@ -189,8 +199,9 @@ public void givenObservable_whenComputationScheduling_thenReturnThreadName() thr
Observable.just("computation")
.subscribeOn(Schedulers.computation())
.subscribe(i -> result += Thread.currentThread().getName());
Thread.sleep(500);
Assert.assertTrue(result.equals("RxComputationScheduler-1"));

await()
.until(() -> assertTrue(result.equals("RxComputationScheduler-1")));
}

@Test
Expand Down Expand Up @@ -229,7 +240,7 @@ public void givenLetters_whenDelay_thenReturne() throws InterruptedException {
.delay(1, TimeUnit.SECONDS, schedulerA)
.subscribe(i -> result += Thread.currentThread().getName() + i + " ");

Thread.sleep(2000);
Assert.assertTrue(result.equals("Sched1-A Sched1-B "));
await()
.until(() -> assertTrue(result.equals("Sched1-A Sched1-B ")));
}
}
25 changes: 15 additions & 10 deletions rxjava/src/test/java/com/baeldung/rxjava/UtilityOperatorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import java.util.concurrent.TimeUnit;

import static com.jayway.awaitility.Awaitility.await;
import static org.junit.Assert.assertTrue;

public class UtilityOperatorsTest {
Expand Down Expand Up @@ -40,9 +41,11 @@ public void givenObservable_whenObserveOnAfterOnNext_thenEmitsEventsOnComputeSch
+ Thread.currentThread().getName());
});

Thread.sleep(2000);
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
await().until(() -> {
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
}
);
}

@Test
Expand All @@ -63,9 +66,10 @@ public void givenObservable_whenObserveOnBeforeOnNext_thenEmitsEventsOnComputeSc
+ Thread.currentThread().getName());
});

Thread.sleep(2000);
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
await().until(() -> {
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
});
}

@Test
Expand All @@ -86,9 +90,10 @@ public void givenObservable_whenSubscribeOn_thenEmitsEventsOnComputeScheduler()
+ Thread.currentThread().getName());
});

Thread.sleep(2000);
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
await().until(() -> {
assertTrue(emittedTotal == 1500);
assertTrue(receivedTotal == 15000);
});
}

@Test
Expand Down Expand Up @@ -210,7 +215,7 @@ public void givenObservables_whenDelay_thenEventsStartAppearAfterATime() throws
value -> System.out.println("delay : " + value),
t -> System.out.println("delay error"),
() -> System.out.println("delay completed"));
Thread.sleep(8000);
//Thread.sleep(8000);
}

@Test
Expand Down