When doing work on feature branches, it’s important to incorporate production-ready commits from master branch as soon as possible.The below walkthtroughs explain the approach. Covered in this article: Git rebasing a feature branch Git rebasing a feature branch when theres’s a conflicting change Interactive rebase Deleting branches Visualizing commits Very useful scenario – grabbing master …
Comparing the current branch to the master – git diff command You can use git diff command with various flags to see either detailed difference between the branches or just a summary. For example, after modifying file2.txt and adding new file3.txt we commit this change on wip2 branch. Then we view the diff summary: ANOther …
This walkthrough will compare the results of different types of merging Our initial state is: we are on wip branch, ahead of master by 3 commits: Use case 1: simple merge We switch to master branch and list the commits Now we tell Git to merge wip onto master Here’s our graph of commits after …
The below walkthrough explains how to cleanup some commits by removing them from the history. You would want to do such drastic action if you need to completely remove a commit, as if it never existed – losing all the edits it introduced. This is our WIP/feature branch, and we will be using rebase to …
Groovy as a dynamic language Groovy can be used to a great benefit to capture branching logic and business rules validation that change frequently. Groovy scripts are interpreted within the JVM, they can provide ability to dynamically modify behavior of a program at runtime. Runtime logic adjustment is an important feature in many business apps. …
Junit Parameterized tests allow a developer to run the same test multiple times with different parameter values.This is very useful feature that greatly improves quality of testing. In order to use parameterized tests you need to annotate test class with @RunWith(Parameterized.class).Then you create a public static method that returns a Collection of Objects – this …
Improve quality of your testing with Parameterized JUnit tests Read More »
To write quality code it’s necesary to test it, as everybody knows and hopefully practices. How do you avoid super complex, fragile Unit tests that span hundreds of lines of code? The answer is you don’t use the real boiler-plate objects, you use test double objects (mock objects). Let’s use Mockito to demonstrate how this …
Mockito Test Cases and Tests where exceptions are expected Read More »
Sometimes you work in an environment where you have no control over a lot of things, and basic needs like setting up a fresh Git repo for your team takes days or weeks. So what you do in the meantime? Don’t waste a single hour for your team – just set up a shared-drive Git …
The below is not so much as a test but rather a sample code how to deal with a FIX 4.4 message – for those who need to quick start. The code is self-explanatory – that is if you read the FIX Protocol documentation.
How do we introduce microservices to a team that has always had one large application? We could follow the following strategy, called Domain Driven Design. The benefit of DDD is that we can start delivering benefits of microservices fast, without waiting for the entire model to get developed (Big Bang approach). First we need to …