add synchronized rule test case

src/AssignmentSupermarketRules.rsc

@@ -6,19 +6,17 @@ import lang::java::m3::AST;
 import lang::java::m3::Core;
 
 // Without this unused import, the type checker complains about model.modifiers. It is as if it doesn't know its type?!
-//import Util;
+import Util;
 
 set[Message] allAssignmentSupermarketRules(M3 model, set[Declaration] ast)
   = aSupermarket_no_synchronized_modifier(model)
   + aSupermarket_no_synchronized_block(ast)
   ;
 
-set[Message] aSupermarket_no_synchronized_modifier(M3 model)
-{ return
+set[Message] aSupermarket_no_synchronized_modifier(M3 model) =
   { error("synchronized should not be used in this assignment", synchronizedThing)
-  | synchronizedThing <- invert(model.modifiers)[synchronized()]
+  | loc synchronizedThing <- invert(model.modifiers)[synchronized()]
   };
-}
 
 set[Message] aSupermarket_no_synchronized_block(set[Declaration] ast) =
   { error("synchronized should not be used in this assignment", m.decl)

src/test-data/assignment15-supermarket-synchronized/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

src/test-data/assignment15-supermarket-synchronized/.gitignore

+**/bin/
+**/build/
+**/nbproject/private/
+**/dist/

src/test-data/assignment15-supermarket-synchronized/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>assignment15-supermarket-synchronized</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

src/test-data/assignment15-supermarket-synchronized/build.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="SuperFastExampleSolution" default="default" basedir=".">
+    <description>Builds, tests, and runs the project SuperFastExampleSolution.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="SuperFastExampleSolution-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

src/test-data/assignment15-supermarket-synchronized/manifest.mf

+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

src/test-data/assignment15-supermarket-synchronized/nbproject/genfiles.properties

+build.xml.data.CRC32=b4b2a641
+build.xml.script.CRC32=4e5b2ae9
+build.xml.stylesheet.CRC32=f85dc8f2@1.90.1.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b4b2a641
+nbproject/build-impl.xml.script.CRC32=63ec12f2
+nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.90.1.48

src/test-data/assignment15-supermarket-synchronized/nbproject/project.properties

+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/SuperFastExampleSolution.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+dist.jlink.output=${dist.jlink.dir}/SuperFastExampleSolution
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=SuperFastExampleSolution
+main.class=Main
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=Oracle_JDK_1.8
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

src/test-data/assignment15-supermarket-synchronized/nbproject/project.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>SuperFastExampleSolution</name>
+            <explicit-platform explicit-source-supported="true"/>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Cashier.java

+package supermarket;
+
+import java.util.concurrent.Callable;
+
+public class Cashier implements Callable<Void> {
+
+	private final Register checkout;
+
+	public Cashier(Register checkout) {
+		this.checkout = checkout;
+	}
+
+	@Override
+	public Void call() {
+		try {
+			while (true) {
+				checkout.putInBin(checkout.removeFromBelt());
+			}
+		} catch (InterruptedException e) {
+			return null;
+		}
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/ConveyorBelt.java

+package supermarket;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class ConveyorBelt<T> {
+
+	private final T[] elements;
+	private int amount, begin, end;
+	private Lock lock = new ReentrantLock();
+	private Condition itemsAvailable = lock.newCondition();
+	private Condition spaceAvailable = lock.newCondition();
+
+	public ConveyorBelt(int size) {
+		elements = (T[]) new Object[size];
+		amount = 0;
+		begin = 0;
+		end = 0;
+	}
+
+	public void putIn(T item) throws InterruptedException {
+		try {
+			lock.lock();
+			while (amount == elements.length) {
+				spaceAvailable.await();
+			}
+			elements[end] = item;
+			end = (end + 1) % elements.length;
+			amount = amount + 1;
+			itemsAvailable.signalAll();
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	public T removeFrom() throws InterruptedException {
+		try {
+			lock.lock();
+			while (amount == 0) {
+				itemsAvailable.await();
+			}
+			T item = elements[begin];
+			begin = (begin + 1) % elements.length;
+			amount = amount - 1;
+			spaceAvailable.signalAll();
+			return item;
+		} finally {
+			lock.unlock();
+		}
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Customer.java

+package supermarket;
+
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.Callable;
+
+public class Customer implements Callable<Integer> {
+
+	private final Store store;
+	private final int customerNumber;
+	private final int numberOfItems;
+	private final Random generator;
+
+	public Customer(int number, Store store) {
+		this.generator = new Random();
+		this.store = store;
+		customerNumber = number;
+		numberOfItems = generator.nextInt(20) + 1;
+		System.out.println("Customer " + customerNumber + " has " + numberOfItems + " items.");
+	}
+
+	@Override
+	public Integer call() {
+		try {
+			List<Item> items = store.getItems(numberOfItems);
+			int checkoutNr = generator.nextInt(Store.NUMBER_OF_CHECKOUTS);
+			Register checkout = store.claimRegister(checkoutNr);
+			
+			synchronized(this) {
+				System.out.println("hello world");
+			}
+
+			System.out.println("Customer " + customerNumber + " starts putting items on belt");
+			items.stream().forEach(checkout::putOnBelt);
+			checkout.putOnBelt(null);
+			System.out.println("Customer " + customerNumber + " finished putting items on belt");
+
+			while (checkout.removeFromBin() != null) {
+			}
+			System.out.println("Customer " + customerNumber + " finished taking items");
+
+			store.freeRegister(checkoutNr);
+			return numberOfItems;
+		} catch (InterruptedException e) {
+			return numberOfItems;
+		}
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Item.java

+package supermarket;
+
+public class Item {
+
+	private final int barcode;
+
+	public Item(int barcode) {
+		this.barcode = barcode;
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Main.java

+package supermarket;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class Main {
+
+	public static final int NR_OF_CLIENTS = 100;
+
+	public static void main(String[] args) throws InterruptedException {
+		ExecutorService executor = Executors.newCachedThreadPool();
+		Store store = new Store(executor);
+
+		List<Future<Void>> cashiers = store.open();
+
+		List<Customer> customers = IntStream.range(0, NR_OF_CLIENTS).mapToObj(i -> new Customer(i, store))
+				.collect(Collectors.toList());
+		List<Future<Integer>> customerResults = executor.invokeAll(customers);
+		int result = customerResults.stream().mapToInt(r -> {
+			try {
+				return r.get();
+			} catch (InterruptedException | ExecutionException ex) {
+				return 0;
+			}
+		}).sum();
+
+		System.out.println("All customers are done. " + result + " items sold.");
+
+		cashiers.stream().forEach(c -> c.cancel(true));
+		executor.shutdown();
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Register.java

+package supermarket;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class Register {
+
+	private static final int CONVEYER_SIZE = 10, BIN_SIZE = 10;
+	private final ConveyorBelt<Item> belt = new ConveyorBelt<>(CONVEYER_SIZE);
+	private final ConveyorBelt<Item> bin = new ConveyorBelt<>(BIN_SIZE);
+
+	private final Lock lock = new ReentrantLock();
+
+	public void putOnBelt(Item article) {
+		try {
+			belt.putIn(article);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public Item removeFromBelt() throws InterruptedException {
+		return belt.removeFrom();
+	}
+
+	public void putInBin(Item article) throws InterruptedException {
+		bin.putIn(article);
+	}
+
+	public Item removeFromBin() throws InterruptedException {
+		return bin.removeFrom();
+	}
+
+	public synchronized void claim() {
+		lock.lock();
+	}
+
+	public void free() {
+		lock.unlock();
+	}
+}

src/test-data/assignment15-supermarket-synchronized/src/supermarket/Store.java

+package supermarket;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class Store {
+
+	public static final int NUMBER_OF_CHECKOUTS = 5;
+
+	private final List<Register> registers;
+	private final ExecutorService executor;
+	private final List<Cashier> cashiers;
+
+	public Register claimRegister(int registerNr) throws InterruptedException {
+		registers.get(registerNr).claim();
+		return registers.get(registerNr);
+	}
+
+	public void freeRegister(int registerNr) {
+		registers.get(registerNr).free();
+	}
+
+	public Store(ExecutorService executor) throws InterruptedException {
+		this.executor = executor;
+
+		registers = IntStream.range(0, NUMBER_OF_CHECKOUTS)
+				.mapToObj(i -> new Register())
+				.collect(Collectors.toList());
+
+		cashiers = registers.stream()
+				.map(r -> new Cashier(r))
+				.collect(Collectors.toList());
+	}
+
+	public List<Future<Void>> open() {
+		return cashiers.stream()
+				.map(c -> executor.submit(c))
+				.collect(Collectors.toList());
+	}
+
+	public List<Item> getItems(int amount) {
+		return IntStream.range(0, amount)
+				.mapToObj(i -> new Item(i))
+				.collect(Collectors.toList());
+	}
+}

src/test/AssignmentSupermarketRulesSpec.rsc

@@ -6,11 +6,20 @@ import Set;
 import \test::SpecUtil;
 import AssignmentSupermarketRules;
 import CodingRules;
+import Util;
 
 test bool aSupermarketExampleSolution()
 {
   <model,ast> = loadTestBoth("assignment15-supermarket-example-solution");
   errors = allAssignmentSupermarketRules(model,ast) + allCodingRules(model);
-  for( e <- errors ) println(e);
   return isEmpty(errors);
+}
+
+test bool aSupermarketSynchronized()
+{
+  <model,ast> = loadTestBoth("assignment15-supermarket-synchronized");
+  errors = allAssignmentSupermarketRules(model,ast) + allCodingRules(model);
+  return size(errors) == 2 &&
+    { "synchronized should not be used in this assignment"
+    } == messages(errors);
 }
\ No newline at end of file